Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / arch / powerpc / cpu / mpc85xx / Kconfig

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 0f703804da4585546d10230f250378db0be650dd..7b42d06952c4116c09177aea508384e247171308 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -2,7 +2,6 @@ menu "mpc85xx CPU"
        depends on MPC85xx
 
 config SYS_CPU
-       string
        default "mpc85xx"
 
 choice
@@ -14,20 +13,22 @@ config TARGET_SBC8548
 config TARGET_SOCRATES
        bool "Support socrates"
 
-config TARGET_HWW1U1A
-       bool "Support HWW1U1A"
-
 config TARGET_B4860QDS
        bool "Support B4860QDS"
+       select SUPPORT_SPL
 
 config TARGET_BSC9131RDB
        bool "Support BSC9131RDB"
+       select SUPPORT_SPL
 
 config TARGET_BSC9132QDS
        bool "Support BSC9132QDS"
+       select SUPPORT_SPL
 
 config TARGET_C29XPCIE
        bool "Support C29XPCIE"
+       select SUPPORT_SPL
+       select SUPPORT_TPL
 
 config TARGET_P3041DS
        bool "Support P3041DS"
@@ -73,18 +74,26 @@ config TARGET_MPC8572DS
 
 config TARGET_P1010RDB
        bool "Support P1010RDB"
+       select SUPPORT_SPL
+       select SUPPORT_TPL
 
 config TARGET_P1022DS
        bool "Support P1022DS"
+       select SUPPORT_SPL
+       select SUPPORT_TPL
 
 config TARGET_P1023RDB
        bool "Support P1023RDB"
 
 config TARGET_P1_P2_RDB
        bool "Support P1_P2_RDB"
+       select SUPPORT_SPL
+       select SUPPORT_TPL
 
 config TARGET_P1_P2_RDB_PC
        bool "Support p1_p2_rdb_pc"
+       select SUPPORT_SPL
+       select SUPPORT_TPL
 
 config TARGET_P1_TWR
        bool "Support p1_twr"
@@ -106,18 +115,22 @@ config TARGET_T1040QDS
 
 config TARGET_T104XRDB
        bool "Support T104xRDB"
+       select SUPPORT_SPL
 
 config TARGET_T208XQDS
        bool "Support T208xQDS"
+       select SUPPORT_SPL
 
 config TARGET_T208XRDB
        bool "Support T208xRDB"
+       select SUPPORT_SPL
 
 config TARGET_T4240EMU
        bool "Support T4240EMU"
 
 config TARGET_T4240QDS
        bool "Support T4240QDS"
+       select SUPPORT_SPL
 
 config TARGET_T4240RDB
        bool "Support T4240RDB"
@@ -145,7 +158,6 @@ config TARGET_XPEDITE550X
 
 endchoice
 
-source "board/exmeritus/hww1u1a/Kconfig"
 source "board/freescale/b4860qds/Kconfig"
 source "board/freescale/bsc9131rdb/Kconfig"
 source "board/freescale/bsc9132qds/Kconfig"