Convert CONFIG_E300 et al to Kconfig

This converts the following to Kconfig:
   CONFIG_E300
   CONFIG_E5500

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 52bc8cf..2ebf8fc 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -1,6 +1,9 @@
 menu "mpc83xx CPU"
        depends on MPC83xx
 
+config E300
+       def_bool y
+
 config SYS_CPU
        default "mpc83xx"
 

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 6c536b3..c1b4e94 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -653,6 +653,7 @@ config ARCH_T1024
        bool
        select BACKSIDE_L2_CACHE
        select E500MC
+       select E5500
        select FSL_LAW
        select SYS_CACHE_SHIFT_6
        select SYS_FSL_DDR_VER_50
@@ -677,6 +678,7 @@ config ARCH_T1040
        bool
        select BACKSIDE_L2_CACHE
        select E500MC
+       select E5500
        select FSL_LAW
        select SYS_CACHE_SHIFT_6
        select SYS_FSL_DDR_VER_50
@@ -701,6 +703,7 @@ config ARCH_T1042
        bool
        select BACKSIDE_L2_CACHE
        select E500MC
+       select E5500
        select FSL_LAW
        select SYS_CACHE_SHIFT_6
        select SYS_FSL_DDR_VER_50
@@ -805,6 +808,9 @@ config E500MC
        help
                Enble PowerPC E500MC core
 
+config E5500
+       bool
+
 config E6500
        bool
        select BTB

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 7eb4566..47bfcc7 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -270,7 +270,6 @@
 #endif
 
 #elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042)
-#define CONFIG_E5500
 #define CONFIG_FSL_CORENET             /* Freescale CoreNet platform */
 #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1
 #define CONFIG_SYS_FSL_QMAN_V3         /* QMAN version 3 */
@@ -299,7 +298,6 @@
 #define CONFIG_SYS_FSL_SFP_VER_3_0
 
 #elif defined(CONFIG_ARCH_T1024)
-#define CONFIG_E5500
 #define CONFIG_FSL_CORENET          /* Freescale CoreNet platform */
 #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1
 #define CONFIG_SYS_FSL_QMAN_V3  /* QMAN version 3 */

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 32dac86..41313d8 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -13,7 +13,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_E300            1 /* E300 family */
 
 #define CONFIG_HWCONFIG
 

diff --git a/include/configs/km/km-mpc8309.h b/include/configs/km/km-mpc8309.h
index ab629be..af35e8e 100644 (file)
--- a/include/configs/km/km-mpc8309.h
+++ b/include/configs/km/km-mpc8309.h
@@ -1,7 +1,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_E300            1       /* E300 family */
 
 #define CONFIG_KM_DEF_ARCH     "arch=ppc_82xx\0"