powerpc: MPC8560: Remove macro CONFIG_MPC8560

Replace CONFIG_MPC8560 with ARCH_MPC8560 in Kconfig and clean up existing
macros.

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

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index c58f76ff91334dd67d4efd06c17a77cc0c7152c3..98f98afa1eb0f4fe87345e2f08606b5ac4074a7a 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -80,6 +80,7 @@ config TARGET_MPC8555CDS
 
 config TARGET_MPC8560ADS
        bool "Support MPC8560ADS"
+       select ARCH_MPC8560
 
 config TARGET_MPC8568MDS
        bool "Support MPC8568MDS"
@@ -211,6 +212,9 @@ config ARCH_MPC8548
 config ARCH_MPC8555
        bool
 
+config ARCH_MPC8560
+       bool
+
 source "board/freescale/b4860qds/Kconfig"
 source "board/freescale/bsc9131rdb/Kconfig"
 source "board/freescale/bsc9132qds/Kconfig"

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 3e6f8f379c76f5e3d2a4b62db7770afbc6513537..268429b897ab83f2dd59531b018b566bfffa16ea 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -294,7 +294,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 /* Everything after the first generation of PQ3 parts has RSTCR */
 #if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \
-       defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_MPC8560)
+       defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_ARCH_MPC8560)
        unsigned long val, msr;
 
        /*

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 93c7193852346715bfeb0c63468d58e35081c20c..a7f43b65424346df9cd88dea8fa75ef85cdb082c 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -626,7 +626,7 @@ void get_sys_info(sys_info_t *sys_info)
                 */
                lcrr_div *= 4;
 #elif !defined(CONFIG_ARCH_MPC8540) && !defined(CONFIG_ARCH_MPC8541) && \
-       !defined(CONFIG_ARCH_MPC8555) && !defined(CONFIG_MPC8560)
+       !defined(CONFIG_ARCH_MPC8555) && !defined(CONFIG_ARCH_MPC8560)
                /*
                 * Yes, the entire PQ38 family use the same
                 * bit-representation for twice the clock divider values.
@@ -682,7 +682,7 @@ int get_clocks (void)
         * AN2919.
         */
 #if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \
-       defined(CONFIG_MPC8560) || defined(CONFIG_ARCH_MPC8555) || \
+       defined(CONFIG_ARCH_MPC8560) || defined(CONFIG_ARCH_MPC8555) || \
        defined(CONFIG_P1022)
        gd->arch.i2c1_clk = sys_info.freq_systembus;
 #elif defined(CONFIG_ARCH_MPC8544)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 4e38d23945537105ca7b9a1195be32518ac5ac2b..ef591b95e09ae002ede9b6d0287dd2c9254d78a5 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -92,7 +92,7 @@
 #define CONFIG_SYS_FSL_SEC_COMPAT      2
 #define CONFIG_SYS_CCSRBAR_DEFAULT     0xff700000
 
-#elif defined(CONFIG_MPC8560)
+#elif defined(CONFIG_ARCH_MPC8560)
 #define CONFIG_MAX_CPUS                        1
 #define CONFIG_SYS_FSL_NUM_LAWS                8
 #define CONFIG_SYS_FSL_DDRC_GEN1

diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index ff9b2d9cd917be9ae5980ddeae1b31e9caded084..b8270c5ffdf983426643113f64639ae47a936e81 100644 (file)
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -327,7 +327,7 @@ void lbc_sdram_init(void);
 #define LCRR_CLKDIV_SHIFT              0
 #if defined(CONFIG_MPC83xx) || defined(CONFIG_ARCH_MPC8540) || \
        defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) || \
-       defined(CONFIG_MPC8560)
+       defined(CONFIG_ARCH_MPC8560)
 #define LCRR_CLKDIV_2                  0x00000002
 #define LCRR_CLKDIV_4                  0x00000004
 #define LCRR_CLKDIV_8                  0x00000008

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 25227e5bcb27e606849fa9aa6751f2c1c0d5d5af..8a0b2d82f7e045fb75323ff1241ccd121479dd70 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -23,7 +23,6 @@
 #define CONFIG_E500            1       /* BOOKE e500 family */
 #define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_MPC8560ADS      1       /* MPC8560ADS board specific */
-#define CONFIG_MPC8560         1
 
 /*
  * default CCARBAR is at 0xff700000

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 39507d3ca70f90bc828ae877f9c2b9fceef81374..bcfb86f05b6f0d9d26f6a91b5152c06bb32c80cb 100644 (file)
--- 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_MPC8560
 CONFIG_MPC8560ADS
 CONFIG_MPC8568
 CONFIG_MPC8568MDS