aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYork Sun2016-11-16 15:54:15 -0800
committerYork Sun2016-11-23 23:42:07 -0800
commit1cdd96f325340fafdaa4a462e239912febd601a7 (patch)
treea260521118d91a8c4b8c228a056bd41cbb90df84
parent9bb1d6bcd28f036ffc44cadd462eef4e36e340a5 (diff)
powerpc: P1011: Remove macro CONFIG_P1011
Replace CONFIG_P1011 with ARCH_P1011 in Kconfig. P1011RDB seems to be in scrapyard though. Signed-off-by: York Sun <york.sun@nxp.com>
-rw-r--r--arch/powerpc/cpu/mpc85xx/Kconfig3
-rw-r--r--arch/powerpc/cpu/mpc85xx/Makefile2
-rw-r--r--arch/powerpc/include/asm/config_mpc85xx.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 0c498d88596..d0c57a1db95 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -241,6 +241,9 @@ config ARCH_MPC8572
config ARCH_P1010
bool
+config ARCH_P1011
+ bool
+
config ARCH_P1022
bool
diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile
index a663379411f..359ef0c337b 100644
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -73,7 +73,7 @@ obj-$(CONFIG_ARCH_MPC8568) += mpc8568_serdes.o
obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o
obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o
obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o
-obj-$(CONFIG_P1011) += p1021_serdes.o
+obj-$(CONFIG_ARCH_P1011) += p1021_serdes.o
obj-$(CONFIG_P1012) += p1021_serdes.o
obj-$(CONFIG_P1013) += p1022_serdes.o
obj-$(CONFIG_P1014) += p1010_serdes.o
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 8ad503e73e4..66a5f14e23f 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -169,7 +169,7 @@
#define CONFIG_ESDHC_HC_BLK_ADDR
/* P1011 is single core version of P1020 */
-#elif defined(CONFIG_P1011)
+#elif defined(CONFIG_ARCH_P1011)
#define CONFIG_MAX_CPUS 1
#define CONFIG_SYS_FSL_NUM_LAWS 12
#define CONFIG_SYS_PPC_E500_DEBUG_TLB 2