Skip to contentSkip to conversation

ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL

PATCH Superseded Adam Ford 1 participant 1 message Sep 19, 2018

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH v2 1/1 ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL

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.

---
V2: Rebase against Master
Use CONFIG_IS_ENABLED instead of defined so this can be enabled/disabled in SPL independently.
Enable CONFIG_SYS_MALLOC_F to allow relocation allowing the serial to build correctly

arch/arm/mach-davinci/da850_lowlevel.c +2 -2
index 95dc93a24f..822e0dc4a1 100644
@@ -288,10 +288,10 @@ int arch_cpu_init(void)
 	/* GPIO setup */
 	board_gpio_init();
 
-
+#if !CONFIG_IS_ENABLED(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
configs/da850evm_direct_nor_defconfig +2 -1
index 4039d0ee59..42cb4127fd 100644
@@ -5,7 +5,6 @@ CONFIG_TARGET_DA850EVM=y
 CONFIG_DA850_LOWLEVEL=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_NR_DRAM_BANKS=1
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -50,6 +49,8 @@ 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
Signature · 1 line
2.17.1