diff options
| author | Adam Ford <aford173@gmail.com> | 2018-07-24 18:06:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-03 19:53:54 -0400 |
| commit | bdaf24f8a5736a07fe633e15bbe2cd9fffaf8fe9 (patch) | |
| tree | 4a80e0f255fcf8caac7a0307c9d0567e25d17070 | |
| parent | 91570b5d0bd8981da11739e21761fb31186e4104 (diff) | |
| download | u-boot-bdaf24f8a5736a07fe633e15bbe2cd9fffaf8fe9.tar.gz | |
ti_omap3_common: Add CONFIG_SYS_NS16550_COMx entries
Several boards do not use the default UART3, so they do a check
for ifdef CONFIG_SPL_BUILD and enable the pointer for
CONFIG_SYS_NS16550_COMx to point to OMAP34XX_UARTx.
Let's consoldate this all into one place, and remove them from the
individual boards.
Signed-off-by: Adam Ford <aford173@gmail.com>
| -rw-r--r-- | include/configs/omap3_cairo.h | 2 | ||||
| -rw-r--r-- | include/configs/omap3_logic.h | 6 | ||||
| -rw-r--r-- | include/configs/ti_omap3_common.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 5081f3200e..72f04c3c18 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -203,8 +203,6 @@ * function per_clocks_enable(). */ #ifdef CONFIG_SPL_BUILD -#undef CONFIG_SYS_NS16550_COM3 -#define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2 #undef CONFIG_SERIAL3 #define CONFIG_SERIAL2 #endif diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 4d811e096c..3b65a8505f 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -16,12 +16,6 @@ #include <configs/ti_omap3_common.h> -#ifdef CONFIG_SPL_BUILD -/* select serial console configuration for SPL */ -#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#endif - - /* * We are only ever GP parts and will utilize all of the "downloaded image" * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB) in diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 7cd4272ce5..6d16fc782b 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -38,6 +38,8 @@ /* Select serial console configuration */ #ifdef CONFIG_SPL_BUILD +#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 +#define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 #endif |