Replace CONFIG_PPC_P3041 with ARCH_P3041 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/cpu/mpc85xx/cmd_errata.c | 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 | 4 ++-- drivers/net/fm/Makefile | 2 +- include/configs/P3041DS.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 0ddb7c5..d8bc1d0 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -41,6 +41,7 @@ config TARGET_C29XPCIE config TARGET_P3041DS bool "Support P3041DS" select PHYS_64BIT + select ARCH_P3041
config TARGET_P4080DS bool "Support P4080DS" @@ -316,6 +317,9 @@ config ARCH_P2020 config ARCH_P2041 bool
+config ARCH_P3041 + 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 de35824..df777f1 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -40,7 +40,7 @@ obj-$(CONFIG_SYS_DPAA_QBMAN) += portals.o
# various SoC specific assignments obj-$(CONFIG_ARCH_P2041) += p2041_ids.o -obj-$(CONFIG_PPC_P3041) += p3041_ids.o +obj-$(CONFIG_ARCH_P3041) += p3041_ids.o obj-$(CONFIG_PPC_P4080) += p4080_ids.o obj-$(CONFIG_PPC_P5020) += p5020_ids.o obj-$(CONFIG_PPC_P5040) += p5040_ids.o @@ -82,7 +82,7 @@ obj-$(CONFIG_ARCH_P1024) += p1021_serdes.o obj-$(CONFIG_ARCH_P1025) += p1021_serdes.o obj-$(CONFIG_ARCH_P2020) += p2020_serdes.o obj-$(CONFIG_ARCH_P2041) += p2041_serdes.o -obj-$(CONFIG_PPC_P3041) += p3041_serdes.o +obj-$(CONFIG_ARCH_P3041) += p3041_serdes.o obj-$(CONFIG_PPC_P4080) += p4080_serdes.o obj-$(CONFIG_PPC_P5020) += p5020_serdes.o obj-$(CONFIG_PPC_P5040) += p5040_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index 1aba6a8..01710b5 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -26,7 +26,7 @@ static void check_erratum_a4849(uint32_t svr) void __iomem *dcsr = (void *)CONFIG_SYS_DCSRBAR + 0xb0000; unsigned int i;
-#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_PPC_P3041) +#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_ARCH_P3041) static const uint8_t offsets[] = { 0x50, 0x54, 0x58, 0x90, 0x94, 0x98 }; @@ -45,7 +45,7 @@ static void check_erratum_a4849(uint32_t svr) } }
-#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_PPC_P3041) +#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_ARCH_P3041) x108 = 0x12; #endif
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index cd47883..8f0a250 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -338,7 +338,7 @@ #define CONFIG_SYS_FSL_ERRATUM_A006261 #define CONFIG_SYS_FSL_A004447_SVR_REV 0x11
-#elif defined(CONFIG_PPC_P3041) +#elif defined(CONFIG_ARCH_P3041) #define CONFIG_SYS_FSL_QORIQ_CHASSIS1 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_MAX_CPUS 4 diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index a928aa2..b75ae11 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -58,7 +58,7 @@ #define CONFIG_KEY_REVOCATION #endif
-#if defined(CONFIG_PPC_P3041) || \ +#if defined(CONFIG_ARCH_P3041) || \ defined(CONFIG_PPC_P4080) || \ defined(CONFIG_PPC_P5020) || \ defined(CONFIG_PPC_P5040) || \ diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 0388d4b..cdfdb88 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1856,8 +1856,8 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define FSL_CORENET_RCWSR11_EC2_FM1_DTSEC2 0x00080000 #define FSL_CORENET_RCWSR11_EC2_USB2 0x00100000 #endif -#if defined(CONFIG_ARCH_P2041) \ - || defined(CONFIG_PPC_P3041) || defined(CONFIG_PPC_P5020) +#if defined(CONFIG_ARCH_P2041) || \ + defined(CONFIG_ARCH_P3041) || defined(CONFIG_PPC_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/drivers/net/fm/Makefile b/drivers/net/fm/Makefile index 9e8c420..b435ecd 100644 --- a/drivers/net/fm/Makefile +++ b/drivers/net/fm/Makefile @@ -20,7 +20,7 @@ obj-$(CONFIG_SYS_FMAN_V3) += memac.o obj-$(CONFIG_ARCH_P1023) += p1023.o # The P204x, P304x, and P5020 are the same obj-$(CONFIG_ARCH_P2041) += p5020.o -obj-$(CONFIG_PPC_P3041) += p5020.o +obj-$(CONFIG_ARCH_P3041) += p5020.o obj-$(CONFIG_PPC_P4080) += p4080.o obj-$(CONFIG_PPC_P5020) += p5020.o obj-$(CONFIG_PPC_P5040) += p5040.o diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h index c901fe2..0150747 100644 --- a/include/configs/P3041DS.h +++ b/include/configs/P3041DS.h @@ -9,7 +9,6 @@ * */ #define CONFIG_P3041DS -#define CONFIG_PPC_P3041
#define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f92d696..2028d18 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3646,7 +3646,6 @@ CONFIG_PPC64BRIDGE CONFIG_PPC_B4420 CONFIG_PPC_B4860 CONFIG_PPC_CLUSTER_START -CONFIG_PPC_P3041 CONFIG_PPC_P4080 CONFIG_PPC_P5020 CONFIG_PPC_P5040