Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 750df1979d5713b3b8a5aab91315d90b9966c60e

Authored by Adam Ford
Committed by Tom Rini
1 parent 668146128a
Exists in smarc_8mq_lf_v2020.04 and in 12 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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.

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

include/configs/ti_omap3_common.h
Diff comments   View file @ 750df19
... ... @@ -27,12 +27,10 @@
27 27 /* NS16550 Configuration */
28 28 #define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */
29 29 #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
30   -#if defined(CONFIG_SPL_BUILD)
31   -#define CONFIG_SYS_NS16550_SERIAL
32 30 #if !defined(CONFIG_DM_SERIAL)
  31 +#define CONFIG_SYS_NS16550_SERIAL
33 32 #define CONFIG_SYS_NS16550_REG_SIZE (-4)
34 33 #endif /* !CONFIG_DM_SERIAL */
35   -#endif /* CONFIG_SPL_BUILD */
36 34 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
37 35 115200}
38 36