Skip to contentSkip to conversation

DM: serial: ti_omap3_common: Don't define serial unless !DM_SERIAL

PATCH In review Adam Ford 3 participants 3 messages Aug 21, 2018 – Sep 18, 2018

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 DM: serial: ti_omap3_common: Don't define serial unless !DM_SERIAL

The serial port was being manually configured during SPL build, however in preparation to allow DM in SPL, this needs to change to be based on whether or not DM_SERIAL is enabled because, soon the assumption that SPL means no DM may not be accurate.

include/configs/ti_omap3_common.h +1 -3
index dcf76305db..c668284b3e 100644
@@ -27,12 +27,10 @@
 /* NS16550 Configuration */
 #define V_NS16550_CLK			48000000	/* 48MHz (APLL96/2) */
 #define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
-#if defined(CONFIG_SPL_BUILD)
-#define CONFIG_SYS_NS16550_SERIAL
 #if !defined(CONFIG_DM_SERIAL)
+#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #endif /* !CONFIG_DM_SERIAL */
-#endif /* CONFIG_SPL_BUILD */
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600, \
 					115200}
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 DM: serial: ti_omap3_common: Don't define serial unless !DM_SERIAL

Quoted 6 lines · Adam Ford

The serial port was being manually configured during SPL build, however in preparation to allow DM in SPL, this needs to change to be based on whether or not DM_SERIAL is enabled because, soon the assumption that SPL means no DM may not be accurate.

#2 lore raw
In reply to Adam Ford

include/configs/ti_omap3_common.h

Quoted 10 lines · Adam Ford

The serial port was being manually configured during SPL build, however in preparation to allow DM in SPL, this needs to change to be based on whether or not DM_SERIAL is enabled because, soon the assumption that SPL means no DM may not be accurate.

include/configs/ti_omap3_common.h +0 -0
index dcf76305db..c668284b3e 100644

Applied to u-boot/master, 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/dfcc5619/attachment.sig>