diff options
author | Tom Rini <trini@konsulko.com> | 2017-06-09 20:59:17 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-06-10 00:34:09 (GMT) |
commit | f2d78c1cedfc58fe469ea45fa67c7dfbb91bcc52 (patch) | |
tree | 67d6b1cf8466001923e64f50693abb8e4dd52cbe /include | |
parent | 264e420f365cd673a0076adfcb975ead7139aedc (diff) | |
download | u-boot-fsl-qoriq-f2d78c1cedfc58fe469ea45fa67c7dfbb91bcc52.tar.xz |
am33xx: Finish migration of CONFIG_AM33XX/AM43XX
Almost all users of CONFIG_AM33XX/AM43XX have been migrated. Finish
moving the last few over to Kconfig, and put all of the boards under the
appropriate Kconfig chocie now. This board choice is non-optional, so
remove that keyword on am33xx.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/bur_am335x_common.h | 1 | ||||
-rw-r--r-- | include/configs/cm_t43.h | 3 | ||||
-rw-r--r-- | include/configs/siemens-am33x-common.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 7907310..8d0e0ea 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -12,7 +12,6 @@ #ifndef __BUR_AM335X_COMMON_H__ #define __BUR_AM335X_COMMON_H__ /* ------------------------------------------------------------------------- */ -#define CONFIG_AM33XX #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ /* Timer information */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 1e63098..7b5ca0d 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -9,7 +9,6 @@ #ifndef __CONFIG_CM_T43_H #define __CONFIG_CM_T43_H -#define CONFIG_AM43XX #define CONFIG_CM_T43 #define CONFIG_ARCH_CPU_INIT #define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */ @@ -21,7 +20,7 @@ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_CLK 48000000 #define CONFIG_SYS_NS16550_COM1 0x44e09000 -#ifdef CONFIG_SPL_BUILD +#if !defined(CONFIG_SPL_DM) || !defined(CONFIG_DM_SERIAL) #define CONFIG_SYS_NS16550_REG_SIZE (-4) #endif diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index b5705b7..21029d1 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -14,8 +14,6 @@ #ifndef __CONFIG_SIEMENS_AM33X_COMMON_H #define __CONFIG_SIEMENS_AM33X_COMMON_H -#define CONFIG_AM33XX - #include <asm/arch/omap.h> #define CONFIG_DMA_COHERENT |