mpc83xx: Introduce ARCH_MPC832*

Replace CONFIG_MPC832* with proper CONFIG_ARCH_MPC832* Kconfig options.

Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 20780ba68bd8caf69d834f87755d42368c32bc3b..1b9402e024b0236ea34afe8a06012974f9ce7aec 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -40,9 +40,11 @@ config TARGET_MPC8315ERDB
 
 config TARGET_MPC8323ERDB
        bool "Support MPC8323ERDB"
+       select ARCH_MPC832X
 
 config TARGET_MPC832XEMDS
        bool "Support MPC832XEMDS"
+       select ARCH_MPC832X
        select BOARD_EARLY_INIT_F
 
 config TARGET_MPC8349EMDS
@@ -82,11 +84,13 @@ config TARGET_SUVD3
        bool "Support suvd3"
        select ARCH_MPC8309 if SYS_EXTRA_OPTIONS="KMTEGR1"
        select ARCH_MPC8309 if SYS_EXTRA_OPTIONS="KMVECT1"
+       select ARCH_MPC832X if SYS_EXTRA_OPTIONS="SUVD3"
        imply CMD_CRAMFS
        imply FS_CRAMFS
 
 config TARGET_TUXX1
        bool "Support tuxx1"
+       select ARCH_MPC832X
        imply CMD_CRAMFS
        imply FS_CRAMFS
 
@@ -128,6 +132,9 @@ config ARCH_MPC8315
        bool
        select ARCH_MPC831X
 
+config ARCH_MPC832X
+       bool
+
 source "board/esd/vme8349/Kconfig"
 source "board/freescale/mpc8308rdb/Kconfig"
 source "board/freescale/mpc8313erdb/Kconfig"

diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 9f09d2955f85a7d1ba9007a5627a6897a81b7607..ab025af70d424361591a174b3396580670894402 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -98,7 +98,7 @@ int get_clocks(void)
 #endif
        u32 core_clk;
        u32 i2c1_clk;
-#if !defined(CONFIG_MPC832x)
+#if !defined(CONFIG_ARCH_MPC832X)
        u32 i2c2_clk;
 #endif
 #if defined(CONFIG_ARCH_MPC8315)
@@ -315,7 +315,7 @@ int get_clocks(void)
        i2c1_clk = tsec2_clk;
 #elif defined(CONFIG_MPC8360)
        i2c1_clk = csb_clk;
-#elif defined(CONFIG_MPC832x)
+#elif defined(CONFIG_ARCH_MPC832X)
        i2c1_clk = enc_clk;
 #elif defined(CONFIG_ARCH_MPC8308) || defined(CONFIG_ARCH_MPC831X)
        i2c1_clk = enc_clk;
@@ -326,7 +326,7 @@ int get_clocks(void)
 #elif defined(CONFIG_ARCH_MPC8309)
        i2c1_clk = csb_clk;
 #endif
-#if !defined(CONFIG_MPC832x)
+#if !defined(CONFIG_ARCH_MPC832X)
        i2c2_clk = csb_clk; /* i2c-2 clk is equal to csb clk */
 #endif
 
@@ -467,7 +467,7 @@ int get_clocks(void)
 #endif
        gd->arch.core_clk = core_clk;
        gd->arch.i2c1_clk = i2c1_clk;
-#if !defined(CONFIG_MPC832x)
+#if !defined(CONFIG_ARCH_MPC832X)
        gd->arch.i2c2_clk = i2c2_clk;
 #endif
 #if !defined(CONFIG_ARCH_MPC8309)
@@ -546,7 +546,7 @@ static int do_clocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #endif
        printf("  I2C1:                %-4s MHz\n",
               strmhz(buf, gd->arch.i2c1_clk));
-#if !defined(CONFIG_MPC832x)
+#if !defined(CONFIG_ARCH_MPC832X)
        printf("  I2C2:                %-4s MHz\n",
               strmhz(buf, gd->arch.i2c2_clk));
 #endif

diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h
index d22d887babd891207fd0f5625a1ad12d58bba3d8..318b79d0b8ab22866f9d9137a606db2cf1dad2d0 100644 (file)
--- a/arch/powerpc/include/asm/immap_83xx.h
+++ b/arch/powerpc/include/asm/immap_83xx.h
@@ -843,7 +843,7 @@ typedef struct immap {
        u8                      qe[0x100000];   /* QE block */
 } immap_t;
 
-#elif defined(CONFIG_MPC832x)
+#elif defined(CONFIG_ARCH_MPC832X)
 typedef struct immap {
        sysconf83xx_t           sysconf;        /* System configuration */
        wdt83xx_t               wdt;            /* Watch Dog Timer (WDT) Registers */

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 578202f3be3f669111782117bc13af082707ca38..bd1b1bb0a7c663d9e54a16a559e8214451d79dd8 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -14,7 +14,6 @@
  */
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
-#define CONFIG_MPC832x         1       /* MPC832x CPU specific */
 
 /*
  * System Clock Setup

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 8f11d9b3a48e1306c96f943c5987208b65e2c299..0bb7db9bc374fd61a8f40e86148f7c21ca9c0469 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -11,7 +11,6 @@
  */
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
-#define CONFIG_MPC832x         1       /* MPC832x CPU specific */
 #define CONFIG_MPC832XEMDS     1       /* MPC832XEMDS board specific */
 
 /*

diff --git a/include/configs/km/km8321-common.h b/include/configs/km/km8321-common.h
index 41b3ba28429ecaa011e4b7b1b12dd030b88c8a0f..a121a445f785a86a1fa8bdb9a8f09605806a11b0 100644 (file)
--- a/include/configs/km/km8321-common.h
+++ b/include/configs/km/km8321-common.h
@@ -26,7 +26,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_QE      /* Has QE */
-#define CONFIG_MPC832x /* MPC832x CPU specific */
 #define CONFIG_KM8321  /* Keymile PBEC8321 board specific */
 
 #define CONFIG_KM_DEF_ARCH     "arch=ppc_8xx\0"

diff --git a/include/linux/immap_qe.h b/include/linux/immap_qe.h
index f7bc503ea33af0f7202a853c6e1ad6f98fc1e718..6552d0e3c5c7c5f8ef15123e19a241aed8ae8db1 100644 (file)
--- a/include/linux/immap_qe.h
+++ b/include/linux/immap_qe.h
@@ -16,7 +16,7 @@
 #define QE_MURAM_SIZE          0xc000UL
 #define MAX_QE_RISC            2
 #define QE_NUM_OF_SNUM         28
-#elif defined(CONFIG_MPC832x) || defined(CONFIG_ARCH_MPC8309)
+#elif defined(CONFIG_ARCH_MPC832X) || defined(CONFIG_ARCH_MPC8309)
 #define QE_MURAM_SIZE          0x4000UL
 #define MAX_QE_RISC            1
 #define QE_NUM_OF_SNUM         28

diff --git a/include/mpc83xx.h b/include/mpc83xx.h
index 0da271b2f36088ed3ec77afa545cbaa855699108..0f4466ae8964b63d6a7de059ecb6ed09ae1b1d6e 100644 (file)
--- a/include/mpc83xx.h
+++ b/include/mpc83xx.h
@@ -208,7 +208,7 @@
 #define SICRH_UC2E1OBI                 0x00000002
 #define SICRH_UC2E2OBI                 0x00000001
 
-#elif defined(CONFIG_MPC832x)
+#elif defined(CONFIG_ARCH_MPC832X)
 /* SICRL bits - MPC832x specific */
 #define SICRL_LDP_LCS_A                        0x80000000
 #define SICRL_IRQ_CKS                  0x20000000
@@ -593,7 +593,7 @@
 #define HRCWL_CORE_TO_CSB_2_5X1                0x00050000
 #define HRCWL_CORE_TO_CSB_3X1          0x00060000
 
-#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832x)
+#if defined(CONFIG_MPC8360) || defined(CONFIG_ARCH_MPC832X)
 #define HRCWL_CEVCOD                   0x000000C0
 #define HRCWL_CEVCOD_SHIFT             6
 #define HRCWL_CE_PLL_VCO_DIV_4         0x00000000
@@ -1126,7 +1126,7 @@
 #define CSCONFIG_ODT_WR_ONLY_CURRENT   0x00010000
 #define CSCONFIG_ODT_WR_ONLY_OTHER_CS  0x00020000
 #define CSCONFIG_ODT_WR_ALL            0x00040000
-#elif defined(CONFIG_MPC832x)
+#elif defined(CONFIG_ARCH_MPC832X)
 #define CSCONFIG_ODT_RD_CFG            0x00400000
 #define CSCONFIG_ODT_WR_CFG            0x00040000
 #elif defined(CONFIG_MPC8360) || defined(CONFIG_MPC837x)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d7bd37adf5def90be2d45562b62590cf1e324ebd..481076e9d2940f7ee8245b3cddc35a62c9914bd2 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1223,7 +1223,6 @@ CONFIG_MONITOR_IS_IN_RAM
 CONFIG_MPC8313ERDB
 CONFIG_MPC8315ERDB
 CONFIG_MPC832XEMDS
-CONFIG_MPC832x
 CONFIG_MPC8349
 CONFIG_MPC8349ITX
 CONFIG_MPC834x