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

[u-boot] / arch / powerpc / cpu / mpc83xx / Kconfig

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 5fd33934b387ebf53a0b5a7c3cf889c7da5dca6d..69a600cc4237c25e82a34db4955cad385cd70670 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -2,7 +2,6 @@ menu "mpc83xx CPU"
        depends on MPC83xx
 
 config SYS_CPU
-       string
        default "mpc83xx"
 
 choice
@@ -25,6 +24,7 @@ config TARGET_MPC8308RDB
 
 config TARGET_MPC8313ERDB
        bool "Support MPC8313ERDB"
+       select SUPPORT_SPL
 
 config TARGET_MPC8315ERDB
        bool "Support MPC8315ERDB"
@@ -65,15 +65,12 @@ config TARGET_SUVD3
 config TARGET_TUXX1
        bool "Support tuxx1"
 
-config TARGET_MERGERBOX
-       bool "Support MERGERBOX"
-
-config TARGET_MVBLM7
-       bool "Support MVBLM7"
-
 config TARGET_TQM834X
        bool "Support TQM834x"
 
+config TARGET_HRCON
+       bool "Support hrcon"
+
 endchoice
 
 source "board/esd/vme8349/Kconfig"
@@ -90,11 +87,10 @@ source "board/freescale/mpc837xemds/Kconfig"
 source "board/freescale/mpc837xerdb/Kconfig"
 source "board/ids/ids8313/Kconfig"
 source "board/keymile/km83xx/Kconfig"
-source "board/matrix_vision/mergerbox/Kconfig"
-source "board/matrix_vision/mvblm7/Kconfig"
 source "board/mpc8308_p1m/Kconfig"
 source "board/sbc8349/Kconfig"
 source "board/tqc/tqm834x/Kconfig"
 source "board/ve8313/Kconfig"
+source "board/gdsys/mpc8308/Kconfig"
 
 endmenu