powerpc: mpc8540: Remove macro CONFIG_MPC8540

Replace CONFIG_MPC8540 with ARCH_MPC8540 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 682d4e78cf380f74c971c5b236eceb1b4625b008..69567db5bb985bb5564f5d5ac0c9c8a9d15db16a 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -60,6 +60,7 @@ config TARGET_MPC8536DS
 
 config TARGET_MPC8540ADS
        bool "Support MPC8540ADS"
+       select ARCH_MPC8540
 
 config TARGET_MPC8541CDS
        bool "Support MPC8541CDS"
@@ -193,6 +194,9 @@ config ARCH_C29X
 config ARCH_MPC8536
        bool
 
+config ARCH_MPC8540
+       bool
+
 config ARCH_MPC8544
        bool
 

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index cabf64cf8c5f45d687faa983c2c04f7a54c9096b..871935d0f33af696117bf94b34461126aa276e57 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -293,7 +293,7 @@ int checkcpu (void)
 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_MPC8540) || defined(CONFIG_MPC8541) || \
+#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_MPC8541) || \
     defined(CONFIG_MPC8555) || defined(CONFIG_MPC8560)
        unsigned long val, msr;
 

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index be03e01b0d0010765eb8fa06f7e014c5853e8a01..55d143101f85505feb50a884a6c8e493f8bbc8f5 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -625,7 +625,7 @@ void get_sys_info(sys_info_t *sys_info)
                 * for four times the clock divider values.
                 */
                lcrr_div *= 4;
-#elif !defined(CONFIG_MPC8540) && !defined(CONFIG_MPC8541) && \
+#elif !defined(CONFIG_ARCH_MPC8540) && !defined(CONFIG_MPC8541) && \
     !defined(CONFIG_MPC8555) && !defined(CONFIG_MPC8560)
                /*
                 * Yes, the entire PQ38 family use the same
@@ -681,7 +681,7 @@ int get_clocks (void)
         * for that SOC. This information is taken from application note
         * AN2919.
         */
-#if defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || \
+#if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_MPC8541) || \
        defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \
        defined(CONFIG_P1022)
        gd->arch.i2c1_clk = sys_info.freq_systembus;

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index be1ab4a1028d4bea13d684cc879ed8882cffb9ff..7f9b2d92d10910e8209768182de19a19485c6801 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -44,7 +44,7 @@
 #define CONFIG_SYS_FSL_ERRATUM_A004508
 #define CONFIG_SYS_FSL_ERRATUM_A005125
 
-#elif defined(CONFIG_MPC8540)
+#elif defined(CONFIG_ARCH_MPC8540)
 #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 402edd7a2a0ceded89d5633053ca1e4bc0cc629d..6e4b087b6e80a8ce72cb2ba46c90af8e3bc54ff6 100644 (file)
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -325,7 +325,7 @@ void lbc_sdram_init(void);
  */
 #define LCRR_CLKDIV                    0x0000001F
 #define LCRR_CLKDIV_SHIFT              0
-#if defined(CONFIG_MPC83xx) || defined (CONFIG_MPC8540) || \
+#if defined(CONFIG_MPC83xx) || defined(CONFIG_ARCH_MPC8540) || \
     defined(CONFIG_MPC8541) || defined (CONFIG_MPC8555) || \
     defined(CONFIG_MPC8560)
 #define LCRR_CLKDIV_2                  0x00000002

diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 1ae5af1fcd2e1d2d6dd6153ed2f823d697369fa6..2e959dd895e1f5af1e8181f471ee22f930386741 100644 (file)
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -124,7 +124,7 @@ typedef struct ccsr_i2c {
        u8      res[4096 - 1 * sizeof(struct fsl_i2c_base)];
 } ccsr_i2c_t;
 
-#if defined(CONFIG_MPC8540) || \
+#if defined(CONFIG_ARCH_MPC8540) || \
        defined(CONFIG_MPC8541) || \
        defined(CONFIG_ARCH_MPC8548) || \
        defined(CONFIG_MPC8555)

diff --git a/doc/README.mpc85xxads b/doc/README.mpc85xxads
index ef927397566c61f97e28bfef34d8c0c8c7f3e1cd..4a9aeb3deb47aeef82bd5f0c7766744d4149ec61 100644 (file)
--- a/doc/README.mpc85xxads
+++ b/doc/README.mpc85xxads
@@ -136,7 +136,7 @@ Updated 13-July-2004 Jon Loeliger
     CONFIG_BOOKE           BOOKE(e.g. Motorola MPC85xx, AMCC 440, etc)
     CONFIG_E500                    BOOKE e500 family(Motorola)
     CONFIG_MPC85xx         MPC8540,MPC8560 and their derivatives
-    CONFIG_MPC8540         MPC8540 specific
+    CONFIG_ARCH_MPC8540            MPC8540 specific
     CONFIG_MPC8540ADS      MPC8540ADS board specific
     CONFIG_MPC8560ADS      MPC8560ADS board specific
     CONFIG_TSEC_ENET       Use on-chip 10/100/1000 ethernet for networking

diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c
index 48255bd87b4857670e4dc20c838a2c49eade8f78..522b02fa0a9767561186efa5c76bf851d2bc0e2a 100644 (file)
--- a/drivers/input/keyboard.c
+++ b/drivers/input/keyboard.c
@@ -20,7 +20,7 @@ static struct input_config config;
 
 static int kbd_read_keys(struct input_config *config)
 {
-#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || \
+#if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \
                defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
        /* no ISR is used, so received chars must be polled */
        ps2ser_check();

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index af3e85e9843944101458550f4106ceb77b08ec15..fab5a493c8e057587fe1c527ebad4dc39a39083b 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -21,7 +21,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC8540         1       /* MPC8540 specific */
 #define CONFIG_MPC8540ADS      1       /* MPC8540ADS board specific */
 
 /*

diff --git a/include/keyboard.h b/include/keyboard.h
index 6725e487bcb81d1b6c725b1535baf436bd0d4fe6..e26f69e8cc6824104d25d437783867e514546050 100644 (file)
--- a/include/keyboard.h
+++ b/include/keyboard.h
@@ -98,7 +98,7 @@ extern int kbd_init_hw(void);
 extern void pckbd_leds(unsigned char leds);
 #endif /* !CONFIG_DM_KEYBOARD */
 
-#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || \
+#if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \
                defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555)
 int ps2ser_check(void);
 #endif

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 142d71d13ed112d895ce3f6ed2b1a5744cf4aa79..8e744518b8d4b2efb3b0270bf609f80c3afebd30 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3140,7 +3140,6 @@ CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN
 CONFIG_MPC83XX_GPIO_1_INIT_VALUE
 CONFIG_MPC83XX_PCI2
 CONFIG_MPC850
-CONFIG_MPC8540
 CONFIG_MPC8540ADS
 CONFIG_MPC8541
 CONFIG_MPC8541CDS