powerpc: MPC8548: Move CONFIG_MPC8548 to Kconfig option

Replace CONFIG_MPC8548 with ARCH_MPC8548 in Kconfig.

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

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 9bcbda006d1fc9c934b26374bf582f9cf7e1a079..530c232d5909fa07c94300542defed9b39a6ea81 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -10,6 +10,7 @@ choice
 
 config TARGET_SBC8548
        bool "Support sbc8548"
+       select ARCH_MPC8548
 
 config TARGET_SOCRATES
        bool "Support socrates"
@@ -63,6 +64,7 @@ config TARGET_MPC8544DS
 
 config TARGET_MPC8548CDS
        bool "Support MPC8548CDS"
+       select ARCH_MPC8548
 
 config TARGET_MPC8555CDS
        bool "Support MPC8555CDS"
@@ -156,6 +158,7 @@ config TARGET_KMP204X
 
 config TARGET_XPEDITE520X
        bool "Support xpedite520x"
+       select ARCH_MPC8548
 
 config TARGET_XPEDITE537X
        bool "Support xpedite537x"
@@ -172,6 +175,9 @@ config TARGET_CYRUS
 
 endchoice
 
+config ARCH_MPC8548
+       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 f4c4fe26028d6a99f8ff229ff7df6227e211c383..1383454cc2770ee8da867ed59a690800ada09266 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -68,7 +68,7 @@ obj-$(CONFIG_SYS_FSL_QORIQ_CHASSIS2) += fsl_corenet2_serdes.o
 obj-$(CONFIG_PPC_C29X) += c29x_serdes.o
 obj-$(CONFIG_MPC8536) += mpc8536_serdes.o
 obj-$(CONFIG_MPC8544) += mpc8544_serdes.o
-obj-$(CONFIG_MPC8548) += mpc8548_serdes.o
+obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o
 obj-$(CONFIG_MPC8568) += mpc8568_serdes.o
 obj-$(CONFIG_MPC8569) += mpc8569_serdes.o
 obj-$(CONFIG_MPC8572) += mpc8572_serdes.o

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 53b3729f987e48af959263727d0b74ad7f38187a..dfea750893ac4292ac3c000239dbfc454b7d44d3 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -442,7 +442,7 @@ ulong cpu_init_f(void)
 #if defined(CONFIG_SECURE_BOOT) && !defined(CONFIG_SYS_RAMBOOT)
        struct law_entry law;
 #endif
-#ifdef CONFIG_MPC8548
+#ifdef CONFIG_ARCH_MPC8548
        ccsr_local_ecm_t *ecm = (void *)(CONFIG_SYS_MPC85xx_ECM_ADDR);
        uint svr = get_svr();
 

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 6d845e859f4a21de5de6111dcf7420ec720b5990..1b4844f523a07adefc53a3377a9865435b149f23 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -66,7 +66,7 @@
 #define CONFIG_SYS_CCSRBAR_DEFAULT     0xff700000
 #define CONFIG_SYS_FSL_ERRATUM_A005125
 
-#elif defined(CONFIG_MPC8548)
+#elif defined(CONFIG_ARCH_MPC8548)
 #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 76ea00b04fa62d74d82e2e44775044e607ab6ba0..64c4435c4a2098ff48507bd8cfd5e2154cdd9e81 100644 (file)
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -124,10 +124,10 @@ typedef struct ccsr_i2c {
        u8      res[4096 - 1 * sizeof(struct fsl_i2c_base)];
 } ccsr_i2c_t;
 
-#if defined(CONFIG_MPC8540) \
-       || defined(CONFIG_MPC8541) \
-       || defined(CONFIG_MPC8548) \
-       || defined(CONFIG_MPC8555)
+#if defined(CONFIG_MPC8540) || \
+       defined(CONFIG_MPC8541) || \
+       defined(CONFIG_ARCH_MPC8548) || \
+       defined(CONFIG_MPC8555)
 /* DUART Registers */
 typedef struct ccsr_duart {
        u8      res1[1280];

diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c
index 510f638ffea8f9ab63eaa93bfca1ee65ca12fd5a..62375717f0916452cb5709976699741265ff3df4 100644 (file)
--- a/board/xes/common/fsl_8xxx_pci.c
+++ b/board/xes/common/fsl_8xxx_pci.c
@@ -55,7 +55,7 @@ void pci_init_board(void)
        } else {
                printf("PCI1: disabled\n");
        }
-#elif defined CONFIG_MPC8548
+#elif defined CONFIG_ARCH_MPC8548
        volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
        /* PCI1 not present on MPC8572 */
        setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_PCI1);

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index fa114b3f1532d65b14df35e7ad5bb05e45fb5f51..40922eedbe6b416ff04cd2571d4fe9739268a549 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -16,7 +16,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC8548         1       /* MPC8548 specific */
 #define CONFIG_MPC8548CDS      1       /* MPC8548CDS board specific */
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index e9f9d30d52a860c13133cd94292b9ffd9739a087..008781ee3524d58cf8da542572dbdd8a637a5729 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -38,7 +38,6 @@
  */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC8548         1       /* MPC8548 specific */
 #define CONFIG_SBC8548         1       /* SBC8548 board specific */
 
 /*

diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index d980c1515ea5a33aca1d94646b3559aa490dcd7f..7f6927bcb891a305f0be2e5ffa62d1cdced43f41 100644 (file)
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -16,7 +16,6 @@
  */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC8548         1
 #define CONFIG_XPEDITE5200     1
 #define CONFIG_SYS_BOARD_NAME  "XPedite5200"
 #define CONFIG_SYS_FORM_PMC_XMC        1

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fc2a08a85661662a07ffd0f717da52fb82c923db..d5a6c9801f7343e797de0b57e91624bb303b4812 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3153,7 +3153,6 @@ CONFIG_MPC8541
 CONFIG_MPC8541CDS
 CONFIG_MPC8544
 CONFIG_MPC8544DS
-CONFIG_MPC8548
 CONFIG_MPC8548CDS
 CONFIG_MPC855
 CONFIG_MPC8555