Replace CONFIG_P1020 with ARCH_P1020 in Kconfig and clean up existing macros.
Signed-off-by: York Sun york.sun@nxp.com ---
arch/powerpc/cpu/mpc85xx/Kconfig | 9 +++++++++ arch/powerpc/cpu/mpc85xx/Makefile | 2 +- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- include/configs/UCP1020.h | 2 -- include/configs/p1_p2_rdb_pc.h | 4 ---- scripts/config_whitelist.txt | 1 - 6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index f755bc8..9142b33 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -120,20 +120,25 @@ config TARGET_P1020MBG bool "Support P1020MBG-PC" select SUPPORT_SPL select SUPPORT_TPL + select ARCH_P1020 + config TARGET_P1020RDB_PC bool "Support P1020RDB-PC" select SUPPORT_SPL select SUPPORT_TPL + select ARCH_P1020
config TARGET_P1020RDB_PD bool "Support P1020RDB-PD" select SUPPORT_SPL select SUPPORT_TPL + select ARCH_P1020
config TARGET_P1020UTM bool "Support P1020UTM" select SUPPORT_SPL select SUPPORT_TPL + select ARCH_P1020
config TARGET_P1021RDB bool "Support P1021RDB" @@ -226,6 +231,7 @@ config TARGET_XPEDITE550X
config TARGET_UCP1020 bool "Support uCP1020" + select ARCH_P1020
config TARGET_CYRUS bool "Support Varisys Cyrus" @@ -278,6 +284,9 @@ config ARCH_P1010 config ARCH_P1011 bool
+config ARCH_P1020 + bool + config ARCH_P1022 bool
diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 49dcbe3..26a6786 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -74,7 +74,7 @@ obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o obj-$(CONFIG_ARCH_P1011) += p1021_serdes.o -obj-$(CONFIG_P1020) += p1021_serdes.o +obj-$(CONFIG_ARCH_P1020) += p1021_serdes.o obj-$(CONFIG_P1021) += p1021_serdes.o obj-$(CONFIG_ARCH_P1022) += p1022_serdes.o obj-$(CONFIG_ARCH_P1023) += p1023_serdes.o diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 40b0671..4947e18 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -183,7 +183,7 @@ #define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125
-#elif defined(CONFIG_P1020) +#elif defined(CONFIG_ARCH_P1020) #define CONFIG_MAX_CPUS 2 #define CONFIG_SYS_FSL_NUM_LAWS 12 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 2 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index ce1cf97..1163b0d 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -27,7 +27,6 @@ #define CONFIG_UCP1020_REV_1_3
#define CONFIG_BOARDNAME "uCP1020-64EE512-0U1-XR-T1" -#define CONFIG_P1020
#define CONFIG_TSEC_ENET #define CONFIG_TSEC1 @@ -59,7 +58,6 @@ #define CONFIG_UCP1020_REV_1_3
#define CONFIG_BOARDNAME_LOCAL "uCP1020-64EEE512-OU1-XR" -#define CONFIG_P1020
#define CONFIG_TSEC_ENET #define CONFIG_TSEC1 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index fa7d059..c9191fa 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -12,7 +12,6 @@
#if defined(CONFIG_TARGET_P1020MBG) #define CONFIG_BOARDNAME "P1020MBG-PC" -#define CONFIG_P1020 #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -23,7 +22,6 @@
#if defined(CONFIG_TARGET_P1020UTM) #define CONFIG_BOARDNAME "P1020UTM-PC" -#define CONFIG_P1020 #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0xe0 #define __SW_BOOT_SD 0x50 @@ -33,7 +31,6 @@ #if defined(CONFIG_TARGET_P1020RDB_PC) #define CONFIG_BOARDNAME "P1020RDB-PC" #define CONFIG_NAND_FSL_ELBC -#define CONFIG_P1020 #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -61,7 +58,6 @@ #if defined(CONFIG_TARGET_P1020RDB_PD) #define CONFIG_BOARDNAME "P1020RDB-PD" #define CONFIG_NAND_FSL_ELBC -#define CONFIG_P1020 #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 53b10f2..858c2d0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3383,7 +3383,6 @@ CONFIG_OS2_ENV_ADDR CONFIG_OS_ENV_ADDR CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE -CONFIG_P1020 CONFIG_P1021 CONFIG_P1024 CONFIG_P1025