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

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 3325af3e5cb1a00fe5b6bd17d5a006e9e9b71f69..8e5a3e2074d31d8c7a386f071a78a0630deb4f2c 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -2,15 +2,11 @@ menu "PowerPC architecture"
        depends on PPC
 
 config SYS_ARCH
-       string
        default "powerpc"
 
 choice
        prompt "CPU select"
 
-config 74xx_7xx
-       bool "74xx"
-
 config MPC512X
        bool "MPC512X"
 
@@ -20,9 +16,6 @@ config 5xx
 config MPC5xxx
        bool "MPC5xxx"
 
-config MPC824X
-       bool "MPC824X"
-
 config MPC8260
        bool "MPC8260"
 
@@ -43,11 +36,9 @@ config 4xx
 
 endchoice
 
-source "arch/powerpc/cpu/74xx_7xx/Kconfig"
 source "arch/powerpc/cpu/mpc512x/Kconfig"
 source "arch/powerpc/cpu/mpc5xx/Kconfig"
 source "arch/powerpc/cpu/mpc5xxx/Kconfig"
-source "arch/powerpc/cpu/mpc824x/Kconfig"
 source "arch/powerpc/cpu/mpc8260/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/Kconfig"
 source "arch/powerpc/cpu/mpc85xx/Kconfig"