leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL"

Browse Source 
This commit is breaking several variants of da850, so:

This reverts commit 5f389201de.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2018-09-14 13:52:08 -04:00
parent 3a8f677822
commit ecb10a41c9
2 changed files with 2 additions and 5 deletions
Show Stats 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 !defined(CONFIG_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

@ -6,7 +6,6 @@ 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_MALLOC_F is not set
CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
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
@ -51,8 +50,6 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_WINBOND=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