[U-Boot] [PATCH 53/97] powerpc: P2041: Remove macro CONFIG_PPC_P2041

Thu Nov 24 08:54:34 CET 2016

Replace CONFIG_PPC_P2041 with ARCH_P2041 in Kconfig and clean up
existing macros.

Signed-off-by: York Sun <york.sun at nxp.com>
---

 arch/powerpc/cpu/mpc85xx/Kconfig           | 5 +++++
 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      | 2 +-
 drivers/net/fm/Makefile                    | 2 +-
 include/configs/P2041RDB.h                 | 1 -
 include/configs/km/kmp204x-common.h        | 2 --
 scripts/config_whitelist.txt               | 1 -
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 51192fe..0ddb7c5 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -170,6 +170,7 @@ config TARGET_P1_TWR
 
 config TARGET_P2041RDB
 	bool "Support P2041RDB"
+	select ARCH_P2041
 	select PHYS_64BIT
 
 config TARGET_QEMU_PPCE500
@@ -221,6 +222,7 @@ config TARGET_CONTROLCENTERD
 
 config TARGET_KMP204X
 	bool "Support kmp204x"
+	select ARCH_P2041
 	select PHYS_64BIT
 
 config TARGET_XPEDITE520X
@@ -311,6 +313,9 @@ config ARCH_P1025
 config ARCH_P2020
 	bool
 
+config ARCH_P2041
+	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 14461e9..de35824 100644
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -39,7 +39,7 @@ obj-$(CONFIG_PCI)	+= pci.o
 obj-$(CONFIG_SYS_DPAA_QBMAN) += portals.o
 
 # various SoC specific assignments
-obj-$(CONFIG_PPC_P2041) += p2041_ids.o
+obj-$(CONFIG_ARCH_P2041) += p2041_ids.o
 obj-$(CONFIG_PPC_P3041) += p3041_ids.o
 obj-$(CONFIG_PPC_P4080) += p4080_ids.o
 obj-$(CONFIG_PPC_P5020) += p5020_ids.o
@@ -81,7 +81,7 @@ obj-$(CONFIG_ARCH_P1023)	+= p1023_serdes.o
 obj-$(CONFIG_ARCH_P1024)	+= p1021_serdes.o
 obj-$(CONFIG_ARCH_P1025)	+= p1021_serdes.o
 obj-$(CONFIG_ARCH_P2020)	+= p2020_serdes.o
-obj-$(CONFIG_PPC_P2041) += p2041_serdes.o
+obj-$(CONFIG_ARCH_P2041) += p2041_serdes.o
 obj-$(CONFIG_PPC_P3041) += p3041_serdes.o
 obj-$(CONFIG_PPC_P4080) += p4080_serdes.o
 obj-$(CONFIG_PPC_P5020) += p5020_serdes.o
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 3b06ae4..1aba6a8 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_PPC_P2041) || defined(CONFIG_PPC_P3041)
+#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_PPC_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_PPC_P2041) || defined(CONFIG_PPC_P3041)
+#if defined(CONFIG_ARCH_P2041) || defined(CONFIG_PPC_P3041)
 	x108 = 0x12;
 #endif
 
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index dc8a696..cd47883 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -300,7 +300,7 @@
 #define CONFIG_SYS_FSL_ERRATUM_A004477
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	1
 
-#elif defined(CONFIG_PPC_P2041) /* also supports P2040 */
+#elif defined(CONFIG_ARCH_P2041) /* also supports P2040 */
 #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 e65487c..a928aa2 100644
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -62,7 +62,7 @@
 	defined(CONFIG_PPC_P4080) ||	\
 	defined(CONFIG_PPC_P5020) ||	\
 	defined(CONFIG_PPC_P5040) ||	\
-	defined(CONFIG_PPC_P2041)
+	defined(CONFIG_ARCH_P2041)
 	#define	CONFIG_FSL_TRUST_ARCH_v1
 #endif
 
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index ba0faa8..0388d4b 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -1856,7 +1856,7 @@ 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_PPC_P2041) \
+#if defined(CONFIG_ARCH_P2041) \
 	|| defined(CONFIG_PPC_P3041) || defined(CONFIG_PPC_P5020)
 #define FSL_CORENET_RCWSR11_EC1_FM1_DTSEC4_RGMII	0x00000000
 #define FSL_CORENET_RCWSR11_EC1_FM1_DTSEC4_MII		0x00800000
diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile
index a4c0ea0..9e8c420 100644
--- a/drivers/net/fm/Makefile
+++ b/drivers/net/fm/Makefile
@@ -19,7 +19,7 @@ obj-$(CONFIG_SYS_FMAN_V3) += memac.o
 # SoC specific SERDES support
 obj-$(CONFIG_ARCH_P1023)	+= p1023.o
 # The P204x, P304x, and P5020 are the same
-obj-$(CONFIG_PPC_P2041) += p5020.o
+obj-$(CONFIG_ARCH_P2041) += p5020.o
 obj-$(CONFIG_PPC_P3041) += p5020.o
 obj-$(CONFIG_PPC_P4080) += p4080.o
 obj-$(CONFIG_PPC_P5020) += p5020.o
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 350756b..500bb00 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -12,7 +12,6 @@
 #define __CONFIG_H
 
 #define CONFIG_P2041RDB
-#define CONFIG_PPC_P2041
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index f557ee2..fad8865 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -8,8 +8,6 @@
 #ifndef _CONFIG_KMP204X_H
 #define _CONFIG_KMP204X_H
 
-#define CONFIG_PPC_P2041
-
 #define CONFIG_SYS_TEXT_BASE	0xfff40000
 
 #define CONFIG_KM_DEF_NETDEV	"netdev=eth0\0"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cc4e057..7b7b084 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3647,7 +3647,6 @@ CONFIG_PPC64BRIDGE
 CONFIG_PPC_B4420
 CONFIG_PPC_B4860
 CONFIG_PPC_CLUSTER_START
-CONFIG_PPC_P2041
 CONFIG_PPC_P3041
 CONFIG_PPC_P4080
 CONFIG_PPC_P5020
-- 
2.7.4

