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

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 3325af3..f37a9cb 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -2,14 +2,11 @@ menu "PowerPC architecture"
        depends on PPC
 
 config SYS_ARCH
-       string
        default "powerpc"
 
 choice
        prompt "CPU select"
-
-config 74xx_7xx
-       bool "74xx"
+       optional
 
 config MPC512X
        bool "MPC512X"
@@ -20,34 +17,45 @@ config 5xx
 config MPC5xxx
        bool "MPC5xxx"
 
-config MPC824X
-       bool "MPC824X"
-
 config MPC8260
        bool "MPC8260"
 
 config MPC83xx
        bool "MPC83xx"
+       select CREATE_ARCH_SYMLINK
+       select SYS_FSL_HAS_SEC
+       select SYS_FSL_SEC_BE
+       select SYS_FSL_SEC_COMPAT_2
 
 config MPC85xx
        bool "MPC85xx"
+       select CREATE_ARCH_SYMLINK
+       select SYS_FSL_DDR
+       select SYS_FSL_DDR_BE
+       imply USB_EHCI_HCD if USB
+       imply CMD_HASH
+       imply CMD_IRQ
 
 config MPC86xx
        bool "MPC86xx"
+       select SYS_FSL_DDR
+       select SYS_FSL_DDR_BE
 
 config 8xx
        bool "MPC8xx"
 
 config 4xx
        bool "PPC4xx"
+       select CREATE_ARCH_SYMLINK
+       imply CMD_IRQ
 
 endchoice
 
-source "arch/powerpc/cpu/74xx_7xx/Kconfig"
+source "arch/powerpc/lib/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"