diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-14 13:52:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-14 13:52:15 -0400 |
| commit | ecb10a41c9adf2c499c3d19fff96a08bb9ad2aef (patch) | |
| tree | e24cdf185958e3707073d45ef2d7a0e8af18779a | |
| parent | 3a8f6778227987e3f4fa7418ecfd6d024341b714 (diff) | |
Revert "ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL"
This commit is breaking several variants of da850, so:
This reverts commit 5f389201dece76b484443773dce2525dc205f5a1.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | arch/arm/mach-davinci/da850_lowlevel.c | 4 | ||||
| -rw-r--r-- | configs/da850evm_direct_nor_defconfig | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c index 8ceb1779f9..95dc93a24f 100644 --- a/arch/arm/mach-davinci/da850_lowlevel.c +++ b/arch/arm/mach-davinci/da850_lowlevel.c @@ -288,10 +288,10 @@ int arch_cpu_init(void) /* GPIO setup */ board_gpio_init(); -#if !defined(CONFIG_DM_SERIAL) + NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM1), CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); -#endif + /* * Fix Power and Emulation Management Register * see sprufw3a.pdf page 37 Table 24 diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 1423a1756d..4039d0ee59 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -6,7 +6,6 @@ CONFIG_DA850_LOWLEVEL=y CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_NR_DRAM_BANKS=1 # CONFIG_SYS_MALLOC_F is not set -CONFIG_DEFAULT_DEVICE_TREE="da850-evm" CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y @@ -51,8 +50,6 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y -CONFIG_SPECIFY_CONSOLE_INDEX=y -CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y |