Finish converting CONFIG_SYS_CACHELINE_SIZE to Kconfig

[platform/kernel/u-boot.git] / arch / powerpc / cpu / mpc83xx / Kconfig

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index a67216a..7c922b2 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -8,20 +8,6 @@ choice
        prompt "Target select"
        optional
 
-config TARGET_MPC8315ERDB
-       bool "Support MPC8315ERDB"
-       select ARCH_MPC8315
-       select BOARD_EARLY_INIT_F
-
-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
        bool "Support MPC8349EMDS"
        select ARCH_MPC8349
@@ -136,7 +122,7 @@ config MPC83XX_SDHC_SUPPORT
 config MPC83XX_SATA_SUPPORT
        bool
 
-config MPC83XX_SECOND_I2C_SUPPORT
+config MPC83XX_SECOND_I2C
        bool
 
 config MPC83XX_LDP_PIN
@@ -145,6 +131,7 @@ config MPC83XX_LDP_PIN
 config ARCH_MPC830X
        bool
        select MPC83XX_SDHC_SUPPORT
+       select SYS_CACHE_SHIFT_5
 
 config ARCH_MPC8308
        bool
@@ -152,14 +139,14 @@ config ARCH_MPC8308
        select MPC83XX_TSEC1_SUPPORT
        select MPC83XX_TSEC2_SUPPORT
        select MPC83XX_PCIE1_SUPPORT
-       select MPC83XX_SECOND_I2C_SUPPORT
+       select MPC83XX_SECOND_I2C
 
 config ARCH_MPC8309
        bool
        select ARCH_MPC830X
        select MPC83XX_QUICC_ENGINE
        select MPC83XX_PCI_SUPPORT
-       select MPC83XX_SECOND_I2C_SUPPORT
+       select MPC83XX_SECOND_I2C
        select SYS_FSL_ERRATUM_ESDHC111
        select FSL_ELBC
 
@@ -168,28 +155,23 @@ config ARCH_MPC831X
        select MPC83XX_PCI_SUPPORT
        select MPC83XX_TSEC1_SUPPORT
        select MPC83XX_TSEC2_SUPPORT
+       select SYS_CACHE_SHIFT_5
 
 config ARCH_MPC8313
        bool
        select ARCH_MPC831X
-       select MPC83XX_SECOND_I2C_SUPPORT
-       select FSL_ELBC
-
-config ARCH_MPC8315
-       bool
-       select ARCH_MPC831X
-       select MPC83XX_PCIE1_SUPPORT
-       select MPC83XX_PCIE2_SUPPORT
-       select MPC83XX_SATA_SUPPORT
+       select MPC83XX_SECOND_I2C
        select FSL_ELBC
 
 config ARCH_MPC832X
        bool
        select MPC83XX_QUICC_ENGINE
        select MPC83XX_PCI_SUPPORT
+       select SYS_CACHE_SHIFT_5
 
 config ARCH_MPC834X
        bool
+       select SYS_CACHE_SHIFT_5
 
 config ARCH_MPC8349
        bool
@@ -198,14 +180,15 @@ config ARCH_MPC8349
        select MPC83XX_TSEC1_SUPPORT
        select MPC83XX_TSEC2_SUPPORT
        select MPC83XX_LDP_PIN
-       select MPC83XX_SECOND_I2C_SUPPORT
+       select MPC83XX_SECOND_I2C
 
 config ARCH_MPC8360
        bool
        select MPC83XX_QUICC_ENGINE
        select MPC83XX_PCI_SUPPORT
        select MPC83XX_LDP_PIN
-       select MPC83XX_SECOND_I2C_SUPPORT
+       select MPC83XX_SECOND_I2C
+       select SYS_CACHE_SHIFT_5
 
 config ARCH_MPC837X
        bool
@@ -217,7 +200,8 @@ config ARCH_MPC837X
        select MPC83XX_SDHC_SUPPORT
        select MPC83XX_SATA_SUPPORT
        select MPC83XX_LDP_PIN
-       select MPC83XX_SECOND_I2C_SUPPORT
+       select MPC83XX_SECOND_I2C
+       select SYS_CACHE_SHIFT_5
        select FSL_ELBC
 
 config SYS_IMMR
@@ -265,9 +249,6 @@ endmenu
 config FSL_ELBC
        bool
 
-source "board/freescale/mpc8315erdb/Kconfig"
-source "board/freescale/mpc8323erdb/Kconfig"
-source "board/freescale/mpc832xemds/Kconfig"
 source "board/freescale/mpc8349emds/Kconfig"
 source "board/freescale/mpc837xerdb/Kconfig"
 source "board/ids/ids8313/Kconfig"