Replace CONFIG_PPC_P5020 with ARCH_P5020 in Kconfig and clean up existing macros.
Signed-off-by: York Sun york.sun@nxp.com ---
arch/powerpc/cpu/mpc85xx/Kconfig | 4 ++++ arch/powerpc/cpu/mpc85xx/Makefile | 4 ++-- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/fsl_secure_boot.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 2 +- configs/Cyrus_P5020_defconfig | 2 +- drivers/net/fm/Makefile | 2 +- include/configs/P5020DS.h | 1 - include/configs/cyrus.h | 6 +++--- scripts/config_whitelist.txt | 1 - 10 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index a68a651..808144e 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -51,6 +51,7 @@ config TARGET_P4080DS config TARGET_P5020DS bool "Support P5020DS" select PHYS_64BIT + select ARCH_P5020
config TARGET_P5040DS bool "Support P5040DS" @@ -324,6 +325,9 @@ config ARCH_P3041 config ARCH_P4080 bool
+config ARCH_P5020 + bool + source "board/freescale/b4860qds/Kconfig" source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9132qds/Kconfig" diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 0ea5547..edd365a 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -42,7 +42,7 @@ obj-$(CONFIG_SYS_DPAA_QBMAN) += portals.o obj-$(CONFIG_ARCH_P2041) += p2041_ids.o obj-$(CONFIG_ARCH_P3041) += p3041_ids.o obj-$(CONFIG_ARCH_P4080) += p4080_ids.o -obj-$(CONFIG_PPC_P5020) += p5020_ids.o +obj-$(CONFIG_ARCH_P5020) += p5020_ids.o obj-$(CONFIG_PPC_P5040) += p5040_ids.o obj-$(CONFIG_PPC_T4240) += t4240_ids.o obj-$(CONFIG_PPC_T4160) += t4240_ids.o @@ -84,7 +84,7 @@ obj-$(CONFIG_ARCH_P2020) += p2020_serdes.o obj-$(CONFIG_ARCH_P2041) += p2041_serdes.o obj-$(CONFIG_ARCH_P3041) += p3041_serdes.o obj-$(CONFIG_ARCH_P4080) += p4080_serdes.o -obj-$(CONFIG_PPC_P5020) += p5020_serdes.o +obj-$(CONFIG_ARCH_P5020) += p5020_serdes.o obj-$(CONFIG_PPC_P5040) += p5040_serdes.o obj-$(CONFIG_PPC_T4240) += t4240_serdes.o obj-$(CONFIG_PPC_T4160) += t4240_serdes.o diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 011aec6..496b845 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -429,7 +429,7 @@ #define CONFIG_SYS_FSL_ERRATUM_A007075 #define CONFIG_SYS_FSL_A004447_SVR_REV 0x20
-#elif defined(CONFIG_PPC_P5020) /* also supports P5010 */ +#elif defined(CONFIG_ARCH_P5020) /* also supports P5010 */ #define CONFIG_SYS_PPC64 /* 64-bit core */ #define CONFIG_SYS_FSL_QORIQ_CHASSIS1 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 38b666c..47c3d98 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -60,7 +60,7 @@
#if defined(CONFIG_ARCH_P3041) || \ defined(CONFIG_ARCH_P4080) || \ - defined(CONFIG_PPC_P5020) || \ + defined(CONFIG_ARCH_P5020) || \ defined(CONFIG_PPC_P5040) || \ defined(CONFIG_ARCH_P2041) #define CONFIG_FSL_TRUST_ARCH_v1 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 83f8b8f..759671a 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1857,7 +1857,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define FSL_CORENET_RCWSR11_EC2_USB2 0x00100000 #endif #if defined(CONFIG_ARCH_P2041) || \ - defined(CONFIG_ARCH_P3041) || defined(CONFIG_PPC_P5020) + defined(CONFIG_ARCH_P3041) || defined(CONFIG_ARCH_P5020) #define FSL_CORENET_RCWSR11_EC1_FM1_DTSEC4_RGMII 0x00000000 #define FSL_CORENET_RCWSR11_EC1_FM1_DTSEC4_MII 0x00800000 #define FSL_CORENET_RCWSR11_EC1_FM1_DTSEC4_NONE 0x00c00000 diff --git a/configs/Cyrus_P5020_defconfig b/configs/Cyrus_P5020_defconfig index 5eb5660..94fc387 100644 --- a/configs/Cyrus_P5020_defconfig +++ b/configs/Cyrus_P5020_defconfig @@ -5,7 +5,7 @@ CONFIG_TARGET_CYRUS=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF40000,PPC_P5020" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF40000,ARCH_P5020" CONFIG_BOOTDELAY=10 CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile index 46dc6df..15d27b8 100644 --- a/drivers/net/fm/Makefile +++ b/drivers/net/fm/Makefile @@ -22,7 +22,7 @@ obj-$(CONFIG_ARCH_P1023) += p1023.o obj-$(CONFIG_ARCH_P2041) += p5020.o obj-$(CONFIG_ARCH_P3041) += p5020.o obj-$(CONFIG_ARCH_P4080) += p4080.o -obj-$(CONFIG_PPC_P5020) += p5020.o +obj-$(CONFIG_ARCH_P5020) += p5020.o obj-$(CONFIG_PPC_P5040) += p5040.o obj-$(CONFIG_PPC_T1040) += t1040.o obj-$(CONFIG_PPC_T1042) += t1040.o diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h index d2cedfe..a942d0c 100644 --- a/include/configs/P5020DS.h +++ b/include/configs/P5020DS.h @@ -9,7 +9,6 @@ * Also supports P5010 DS */ #define CONFIG_P5020DS -#define CONFIG_PPC_P5020
#define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 4a11092..5f5138a 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -9,7 +9,7 @@
#define CONFIG_CYRUS
-#if !defined(CONFIG_PPC_P5020) && !defined(CONFIG_PPC_P5040) +#if !defined(CONFIG_ARCH_P5020) && !defined(CONFIG_PPC_P5040) #error Must call Cyrus CONFIG with a specific CPU enabled. #endif
@@ -18,7 +18,7 @@ #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 #define CONFIG_PCIE4 -#ifdef CONFIG_PPC_P5020 +#ifdef CONFIG_ARCH_P5020 #define CONFIG_SYS_FSL_RAID_ENGINE #define CONFIG_SYS_DPAA_RMAN #endif @@ -30,7 +30,7 @@ #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc #define CONFIG_SYS_FSL_PBL_PBI board/varisys/cyrus/pbi.cfg -#if defined(CONFIG_PPC_P5020) +#if defined(CONFIG_ARCH_P5020) #define CONFIG_SYS_CLK_FREQ 133000000 #define CONFIG_SYS_FSL_PBL_RCW board/varisys/cyrus/rcw_p5020_v2.cfg #elif defined(CONFIG_PPC_P5040) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e92836f..8af8ffc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3644,7 +3644,6 @@ CONFIG_PPC64BRIDGE CONFIG_PPC_B4420 CONFIG_PPC_B4860 CONFIG_PPC_CLUSTER_START -CONFIG_PPC_P5020 CONFIG_PPC_P5040 CONFIG_PPC_SPINTABLE_COMPATIBLE CONFIG_PPC_T1023