diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-12 17:40:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-12 17:40:51 -0400 |
| commit | e52ef7ce6797ff8ead49cc9540376b870be4738c (patch) | |
| tree | 6eea13871f81ef7add6b08df5ba9b15513a27fef | |
| parent | b2a22b2c9f07e4c78108feb3bc16e18ebd88388a (diff) | |
| download | u-boot-WIP/omap2plus-migrations.zip u-boot-WIP/omap2plus-migrations.tar.gz u-boot-WIP/omap2plus-migrations.tar.bz2 | |
arm: omap2plus: Enforce DM_SERIAL if SERIALWIP/omap2plus-migrations
With the migration deadline for DM_SERIAL, enforce DM_SERIAL if SERIAL
is enabled. Continue to allow for non-DM_SERIAL in SPL. This means in
some board header files we need to guard some defines for use in this
case.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | include/configs/am43xx_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/nokia_rx51.h | 2 | ||||
| -rw-r--r-- | include/configs/ti814x_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/ti816x_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/ti_am335x_common.h | 2 | ||||
| -rw-r--r-- | include/configs/ti_omap3_common.h | 2 |
7 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6771f14..64fca15 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -807,6 +807,7 @@ config ARCH_K3 config ARCH_OMAP2PLUS bool "TI OMAP2+" select CPU_V7A + select DM_SERIAL if SERIAL select GPIO_EXTRA_HEADER select SPL_BOARD_INIT if SPL select SPL_STACK_R if SPL diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 5057441..77d1913 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -15,7 +15,7 @@ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_CLK 48000000 -#if !defined(CONFIG_SPL_DM) || !defined(CONFIG_DM_SERIAL) +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_SERIAL #endif diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index e837b12..3a7722f 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -42,9 +42,11 @@ */ #define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK +#endif /* * select serial console configuration diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 95434aa..ec16257 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -81,10 +81,12 @@ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* NS16550 Configuration */ +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK (48000000) #define CONFIG_SYS_NS16550_COM1 0x48020000 /* Base EVM has UART0 */ +#endif /* CPU */ diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index c2dfdeb..b7aede8 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -33,10 +33,12 @@ /* * NS16550 Configuration */ +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK (48000000) #define CONFIG_SYS_NS16550_COM1 0x48024000 /* Base EVM has UART2 */ +#endif /* allow overwriting serial config and ethaddr */ diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index f8bd555..75549cf 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -19,7 +19,7 @@ /* NS16550 Configuration */ #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_NS16550_SERIAL -#ifndef CONFIG_DM_SERIAL +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CONFIG_SYS_NS16550_REG_SIZE (-4) #endif #endif diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 3d7cb17..e6eb56c 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -27,7 +27,7 @@ /* NS16550 Configuration */ #define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK -#if !defined(CONFIG_DM_SERIAL) +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #endif /* !CONFIG_DM_SERIAL */ |