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

[u-boot] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 3b3f4463ba4ab34c2c5b60ecdbcb6244ce8afc37..13a79560b24be7e4bfb143e6115313c36fd14f0f 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -8,43 +8,39 @@ choice
        prompt "CPU select"
        optional
 
-config MPC512X
-       bool "MPC512X"
-
-config 5xx
-       bool "MPC5xx"
-
-config MPC5xxx
-       bool "MPC5xxx"
-
-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
+       imply CMD_REGINFO
 
-config 8xx
+config MPC8xx
        bool "MPC8xx"
-
-config 4xx
-       bool "PPC4xx"
+       select BOARD_EARLY_INIT_F
+       imply CMD_REGINFO
+       imply MPC8xx_WATCHDOG
 
 endchoice
 
-source "arch/powerpc/cpu/mpc512x/Kconfig"
-source "arch/powerpc/cpu/mpc5xx/Kconfig"
-source "arch/powerpc/cpu/mpc5xxx/Kconfig"
-source "arch/powerpc/cpu/mpc8260/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/Kconfig"
 source "arch/powerpc/cpu/mpc85xx/Kconfig"
 source "arch/powerpc/cpu/mpc86xx/Kconfig"
 source "arch/powerpc/cpu/mpc8xx/Kconfig"
-source "arch/powerpc/cpu/ppc4xx/Kconfig"
 
 endmenu