Skip to contentSkip to conversation

ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL

PATCH Superseded Adam Ford 2 participants 3 messages Aug 14, 2018 – Sep 19, 2018

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 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.

arch/arm/mach-davinci/da850_lowlevel.c +2 -2
index 95dc93a24f..8ceb1779f9 100644
@@ -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
configs/da850evm_direct_nor_defconfig +2 -1
index bb8fa3bd6e..baadd01c2c 100644
@@ -5,7 +5,6 @@ CONFIG_TARGET_DA850EVM=y
 CONFIG_DA850_LOWLEVEL=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
@@ -45,6 +44,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=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
#1 lore raw

arch/arm/mach-davinci/da850_lowlevel.c

Quoted 8 lines · Adam Ford

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.

arch/arm/mach-davinci/da850_lowlevel.c +0 -0
index 95dc93a24f..8ceb1779f9 100644

Applied to u-boot/master, but then reverted as it turns out to not build currently. Did I miss some other required patches? Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180918/83e30983/attachment.sig>
author
#2 lore raw
Quoted 7 lines · Tom Rini
Quoted 4 lines · Adam Ford

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.

Quoted 7 lines

arch/arm/mach-davinci/da850_lowlevel.c

Quoted 4 lines
arch/arm/mach-davinci/da850_lowlevel.c +0 -0
index 95dc93a24f..8ceb1779f9 100644

Applied to u-boot/master, but then reverted as it turns out to not build currently. Did I miss some other required patches? Thanks!

I must have missed a patch somewhere or something in Master changed between now and when I submitted the patch. Either way, I just submitted a V2 which had to enable CONFIG_SYS_MALLOC_F. That seemed to fix the build issue, but I also tweaked the patch a bit to be a bit more flexible in SPL.

adam

Quoted 3 lines

--
Tom