From a990799d5248d3bb92bf2a8919936e1562693b07 Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 10:59:02 -0800 Subject: powerpc: P1021: Remove macro CONFIG_P1021 Replace CONFIG_P1021 with ARCH_P1021 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/powerpc/include/asm') diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 4947e18d4a..bcd75508dc 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -199,7 +199,7 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #endif -#elif defined(CONFIG_P1021) +#elif defined(CONFIG_ARCH_P1021) #define CONFIG_MAX_CPUS 2 #define CONFIG_SYS_FSL_NUM_LAWS 12 #define CONFIG_SYS_PPC_E500_DEBUG_TLB 2 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index c82c709e70..b0f81ec4c1 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2488,7 +2488,7 @@ typedef struct ccsr_gur { u8 res11a[76]; par_io_t qe_par_io[7]; u8 res11b[1600]; -#elif defined(CONFIG_P1021) || defined(CONFIG_P1025) +#elif defined(CONFIG_ARCH_P1021) || defined(CONFIG_P1025) u8 res11a[12]; u32 iovselsr; u8 res11b[60]; -- cgit v1.2.1