GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-27 17:12:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL

Browse source 
With DM enabled, this patch enables DM_SERIAL and removes
the NS16550 initialization from da850_lowlevel since the driver
will take care of that itself.

Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
Adam Ford 2018-09-19 16:06:49 -05:00 • committed by Tom Rini
parent 42140dd096
commit 973fcc8dae
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-davinci/da850_lowlevel.c
View file

@ -288,10 +288,10 @@ int arch_cpu_init(void)
/* GPIO setup */ /* GPIO setup */
board_gpio_init(); board_gpio_init();
#if !CONFIG_IS_ENABLED(DM_SERIAL)
NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM1), NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM1),
CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
#endif
/* /*
* Fix Power and Emulation Management Register * Fix Power and Emulation Management Register
* see sprufw3a.pdf page 37 Table 24 * see sprufw3a.pdf page 37 Table 24

3
configs/da850evm_direct_nor_defconfig
View file

@ -5,7 +5,6 @@ CONFIG_TARGET_DA850EVM=y
CONFIG_DA850_LOWLEVEL=y CONFIG_DA850_LOWLEVEL=y
CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TI_COMMON_CMD_OPTIONS=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
# CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT" CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
@ -53,6 +52,8 @@ CONFIG_PINCTRL=y
CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_SINGLE=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_DRIVER_TI_EMAC=y CONFIG_DRIVER_TI_EMAC=y
CONFIG_SPECIFY_CONSOLE_INDEX=y
CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y

2
include/configs/da850evm.h
View file

@ -116,7 +116,7 @@
* Serial Driver info * Serial Driver info
*/ */
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_DIRECT_NOR_BOOT) #if !CONFIG_IS_ENABLED(DM_SERIAL)
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */
#define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */