Merge git://git.denx.de/u-boot-rockchip

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

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 2a1abe03a9e81b030e6a7e68fb2b4a210bf57b57..3ea62caada7d9021f45bdb4fefe037a24088497a 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_MPC8308_P1M
        bool "Support mpc8308_p1m"
@@ -41,12 +42,6 @@ config TARGET_MPC8349EMDS
 config TARGET_MPC8349ITX
        bool "Support MPC8349ITX"
 
-config TARGET_MPC8360EMDS
-       bool "Support MPC8360EMDS"
-
-config TARGET_MPC8360ERDK
-       bool "Support MPC8360ERDK"
-
 config TARGET_MPC837XEMDS
        bool "Support MPC837XEMDS"
 
@@ -55,6 +50,7 @@ config TARGET_MPC837XERDB
 
 config TARGET_IDS8313
        bool "Support ids8313"
+       select DM
 
 config TARGET_KM8360
        bool "Support km8360"
@@ -68,6 +64,12 @@ config TARGET_TUXX1
 config TARGET_TQM834X
        bool "Support TQM834x"
 
+config TARGET_HRCON
+       bool "Support hrcon"
+
+config TARGET_STRIDER
+       bool "Support strider"
+
 endchoice
 
 source "board/esd/vme8349/Kconfig"
@@ -78,8 +80,6 @@ source "board/freescale/mpc8323erdb/Kconfig"
 source "board/freescale/mpc832xemds/Kconfig"
 source "board/freescale/mpc8349emds/Kconfig"
 source "board/freescale/mpc8349itx/Kconfig"
-source "board/freescale/mpc8360emds/Kconfig"
-source "board/freescale/mpc8360erdk/Kconfig"
 source "board/freescale/mpc837xemds/Kconfig"
 source "board/freescale/mpc837xerdb/Kconfig"
 source "board/ids/ids8313/Kconfig"
@@ -88,5 +88,6 @@ source "board/mpc8308_p1m/Kconfig"
 source "board/sbc8349/Kconfig"
 source "board/tqc/tqm834x/Kconfig"
 source "board/ve8313/Kconfig"
+source "board/gdsys/mpc8308/Kconfig"
 
 endmenu