Replace CONFIG_MPC8568 with ARCH_MPC8568 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 | 2 +- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 2 +- include/configs/MPC8568MDS.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 98f98af..9545793 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -84,6 +84,7 @@ config TARGET_MPC8560ADS
config TARGET_MPC8568MDS bool "Support MPC8568MDS" + select ARCH_MPC8568
config TARGET_MPC8569MDS bool "Support MPC8569MDS" @@ -215,6 +216,9 @@ config ARCH_MPC8555 config ARCH_MPC8560 bool
+config ARCH_MPC8568 + 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 4733bfd..390eede 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -69,7 +69,7 @@ obj-$(CONFIG_ARCH_C29X) += c29x_serdes.o obj-$(CONFIG_ARCH_MPC8536) += mpc8536_serdes.o obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o -obj-$(CONFIG_MPC8568) += mpc8568_serdes.o +obj-$(CONFIG_ARCH_MPC8568) += mpc8568_serdes.o obj-$(CONFIG_MPC8569) += mpc8569_serdes.o obj-$(CONFIG_MPC8572) += mpc8572_serdes.o obj-$(CONFIG_P1010) += p1010_serdes.o diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index ef591b9..c38d983 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -98,7 +98,7 @@ #define CONFIG_SYS_FSL_DDRC_GEN1 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
-#elif defined(CONFIG_MPC8568) +#elif defined(CONFIG_ARCH_MPC8568) #define CONFIG_MAX_CPUS 1 #define CONFIG_SYS_FSL_NUM_LAWS 10 #define CONFIG_SYS_FSL_DDRC_GEN2 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index d6e7f62..ec4c837 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2484,7 +2484,7 @@ typedef struct ccsr_gur { u32 svr; /* System version */ u8 res10[8]; u32 rstcr; /* Reset control */ -#if defined(CONFIG_MPC8568)||defined(CONFIG_MPC8569) +#if defined(CONFIG_ARCH_MPC8568) || defined(CONFIG_MPC8569) u8 res11a[76]; par_io_t qe_par_io[7]; u8 res11b[1600]; diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 62f06db..18adc6f 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -13,7 +13,6 @@ /* High Level Configuration Options */ #define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_E500 1 /* BOOKE e500 family */ -#define CONFIG_MPC8568 1 /* MPC8568 specific */ #define CONFIG_MPC8568MDS 1 /* MPC8568MDS board specific */
#define CONFIG_SYS_TEXT_BASE 0xfff80000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 722fb66..c6f12d0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3141,7 +3141,6 @@ CONFIG_MPC83XX_GPIO_1_INIT_VALUE CONFIG_MPC83XX_PCI2 CONFIG_MPC850 CONFIG_MPC855 -CONFIG_MPC8568 CONFIG_MPC8568MDS CONFIG_MPC8569 CONFIG_MPC8569MDS