diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index d8bc1d0beb88b0ee68a2d1ff2fa345df8bb7e762..a68a65146f7f4b94f9df246e7cd6b6751260b54d 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -46,6 +46,7 @@ config TARGET_P3041DS
 config TARGET_P4080DS
 	bool "Support P4080DS"
 	select PHYS_64BIT
+	select ARCH_P4080
 
 config TARGET_P5020DS
 	bool "Support P5020DS"
@@ -320,6 +321,9 @@ config ARCH_P2041
 config ARCH_P3041
 	bool
 
+config ARCH_P4080
+	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 df777f124e3ac4ea60b2a5b44c218ec7a03a2e7a..0ea55471eb9091395d73d656c5ff4bc79252868a 100644
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -41,7 +41,7 @@ obj-$(CONFIG_SYS_DPAA_QBMAN) += portals.o
 # various SoC specific assignments
 obj-$(CONFIG_ARCH_P2041) += p2041_ids.o
 obj-$(CONFIG_ARCH_P3041) += p3041_ids.o
-obj-$(CONFIG_PPC_P4080) += p4080_ids.o
+obj-$(CONFIG_ARCH_P4080) += p4080_ids.o
 obj-$(CONFIG_PPC_P5020) += p5020_ids.o
 obj-$(CONFIG_PPC_P5040) += p5040_ids.o
 obj-$(CONFIG_PPC_T4240) += t4240_ids.o
@@ -83,7 +83,7 @@ obj-$(CONFIG_ARCH_P1025)	+= p1021_serdes.o
 obj-$(CONFIG_ARCH_P2020)	+= p2020_serdes.o
 obj-$(CONFIG_ARCH_P2041) += p2041_serdes.o
 obj-$(CONFIG_ARCH_P3041) += p3041_serdes.o
-obj-$(CONFIG_PPC_P4080) += p4080_serdes.o
+obj-$(CONFIG_ARCH_P4080) += p4080_serdes.o
 obj-$(CONFIG_PPC_P5020) += p5020_serdes.o
 obj-$(CONFIG_PPC_P5040) += p5040_serdes.o
 obj-$(CONFIG_PPC_T4240) += t4240_serdes.o
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 01710b560f4482e02dfc6ead1ea2687729feb773..d31193467714a4fa127794e6ecb17f45653cbdd4 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -31,7 +31,7 @@ static void check_erratum_a4849(uint32_t svr)
 		0x50, 0x54, 0x58, 0x90, 0x94, 0x98
 	};
 #endif
-#ifdef CONFIG_PPC_P4080
+#ifdef CONFIG_ARCH_P4080
 	static const uint8_t offsets[] = {
 		0x60, 0x64, 0x68, 0x6c, 0xa0, 0xa4, 0xa8, 0xac
 	};
@@ -49,7 +49,7 @@ static void check_erratum_a4849(uint32_t svr)
 	x108 = 0x12;
 #endif
 
-#ifdef CONFIG_PPC_P4080
+#ifdef CONFIG_ARCH_P4080
 	/*
 	 * For P4080, the erratum document says that the value at offset 0x108
 	 * should be 0x12 on rev2, or 0x1c on rev3.
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 047c972ac78e8855e09c56eebe36289de0458a37..eeee92c07bb4b59dffd15a585eca2fb34d243efe 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -490,7 +490,7 @@ static void ft_fixup_qe_snum(void *blob)
 }
 #endif
 
-#if defined(CONFIG_PPC_P4080)
+#if defined(CONFIG_ARCH_P4080)
 static void fdt_fixup_usb(void *fdt)
 {
 	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 72d5e3007d9d20fc7f6b9205976988f17b82597d..20d039f3386e5682e379d4bd736bb1954bef9f0c 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -76,7 +76,7 @@ static const struct {
 	{ 17, 163, FSL_SRDS_BANK_2 },
 	{ 18, 164, FSL_SRDS_BANK_2 },
 	{ 19, 165, FSL_SRDS_BANK_2 },
-#ifdef CONFIG_PPC_P4080
+#ifdef CONFIG_ARCH_P4080
 	{ 20, 170, FSL_SRDS_BANK_3 },
 	{ 21, 171, FSL_SRDS_BANK_3 },
 	{ 22, 172, FSL_SRDS_BANK_3 },
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 8f0a25012a7b3e81f640fb163dcd04a20216d0a3..011aec68483bacdb1c59b2cf2f01541e807464fd 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -378,7 +378,7 @@
 #define CONFIG_SYS_FSL_ERRATUM_A006261
 #define CONFIG_SYS_FSL_A004447_SVR_REV	0x20
 
-#elif defined(CONFIG_PPC_P4080) /* also supports P4040 */
+#elif defined(CONFIG_ARCH_P4080) /* also supports P4040 */
 #define CONFIG_SYS_FSL_QORIQ_CHASSIS1
 #define CONFIG_FSL_CORENET		/* Freescale CoreNet platform */
 #define CONFIG_MAX_CPUS			8
diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index b75ae11a6c003fad407fd33bf10f88e3a141fc93..38b666c1bad0a7d9ba2c6e88d2ec88afdd89a718 100644
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -59,7 +59,7 @@
 #endif
 
 #if defined(CONFIG_ARCH_P3041)	||	\
-	defined(CONFIG_PPC_P4080) ||	\
+	defined(CONFIG_ARCH_P4080) ||	\
 	defined(CONFIG_PPC_P5020) ||	\
 	defined(CONFIG_PPC_P5040) ||	\
 	defined(CONFIG_ARCH_P2041)
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index cdfdb88ea6a517967da41b754eea91cfca5ebd4e..83f8b8fe8bb6108e14171013f61567cc4baae88d 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -1848,7 +1848,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
 #define FSL_CORENET_RCWSR8_HOST_AGT_B1		0x00e00000
 #define FSL_CORENET_RCWSR8_HOST_AGT_B2		0x00100000
 #define FSL_CORENET_RCWSR11_EC1			0x00c00000 /* bits 360..361 */
-#ifdef CONFIG_PPC_P4080
+#ifdef CONFIG_ARCH_P4080
 #define FSL_CORENET_RCWSR11_EC1_FM1_DTSEC1		0x00000000
 #define FSL_CORENET_RCWSR11_EC1_FM1_USB1		0x00800000
 #define FSL_CORENET_RCWSR11_EC2			0x001c0000 /* bits 363..365 */
diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile
index b435ecdacef1d6f42352061583288fec5a562e03..46dc6df55831f39e2db2b82841f6d6e4db4b8e1c 100644
--- a/drivers/net/fm/Makefile
+++ b/drivers/net/fm/Makefile
@@ -21,7 +21,7 @@ obj-$(CONFIG_ARCH_P1023)	+= p1023.o
 # The P204x, P304x, and P5020 are the same
 obj-$(CONFIG_ARCH_P2041) += p5020.o
 obj-$(CONFIG_ARCH_P3041) += p5020.o
-obj-$(CONFIG_PPC_P4080) += p4080.o
+obj-$(CONFIG_ARCH_P4080) += p4080.o
 obj-$(CONFIG_PPC_P5020) += p5020.o
 obj-$(CONFIG_PPC_P5040) += p5040.o
 obj-$(CONFIG_PPC_T1040) += t1040.o
diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h
index 0d44c008aa9fe30d9ddf4c4070937d3318617ebd..020144e5afff2ee655908d9a2e5cea78bb374e7e 100644
--- a/include/configs/P4080DS.h
+++ b/include/configs/P4080DS.h
@@ -9,7 +9,6 @@
  * Also supports P4040 DS
  */
 #define CONFIG_P4080DS
-#define CONFIG_PPC_P4080
 
 #define CONFIG_FSL_NGPIXIS		/* use common ngPIXIS code */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 10dedf6c465ec103f4b5163506da316a94f1fb4e..3830f1086d737a6628c5d3cee52f14f0498604dc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3645,7 +3645,6 @@ CONFIG_PPC64BRIDGE
 CONFIG_PPC_B4420
 CONFIG_PPC_B4860
 CONFIG_PPC_CLUSTER_START
-CONFIG_PPC_P4080
 CONFIG_PPC_P5020
 CONFIG_PPC_P5040
 CONFIG_PPC_SPINTABLE_COMPATIBLE