[POWERPC] 4xx Kconfig cleanup

Remove some leftover cruft in the 40x Kconfig file.  Also make sure we
select WANT_DEVICE_TREE for 40x.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index ded357c17414ad16b8643b2e03af6a39992ab511..2cc7343b468c9196818f2a874f2bb25af6a73ba7 100644 (file)
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -1,16 +1,3 @@
-config 4xx
-       bool
-       depends on 40x || 44x
-       default y
-
-config BOOKE
-       bool
-       depends on 44x
-       default y
-
-menu "AMCC 40x options"
-       depends on 40x
-
 #config BUBINGA
 #      bool "Bubinga"
 #      depends on 40x
@@ -82,8 +69,6 @@ menu "AMCC 40x options"
 #      help
 #        This option enables support for the Xilinx ML300 evaluation board.
 
-endmenu
-
 # 40x specific CPU modules, selected based on the board above.
 config NP405H
        bool
@@ -126,68 +111,6 @@ config IBM405_ERR77
 config IBM405_ERR51
        bool
 
-menu "AMCC 44x options"
-       depends on 44x
-
-#config BAMBOO
-#      bool "Bamboo"
-#      depends on 44x
-#      default n
-#      select 440EP
-#      help
-#        This option enables support for the IBM PPC440EP evaluation board.
-
-config EBONY
-       bool "Ebony"
-       depends on 44x
-       default y
-       select 440GP
-       help
-         This option enables support for the IBM PPC440GP evaluation board.
-
-#config LUAN
-#      bool "Luan"
-#      depends on 44x
-#      default n
-#      select 440SP
-#      help
-#        This option enables support for the IBM PPC440SP evaluation board.
-
-#config OCOTEA
-#      bool "Ocotea"
-#      depends on 44x
-#      default n
-#      select 440GX
-#      help
-#        This option enables support for the IBM PPC440GX evaluation board.
-
-endmenu
-
-# 44x specific CPU modules, selected based on the board above.
-config 440EP
-       bool
-       select PPC_FPU
-       select IBM440EP_ERR42
-
-config 440GP
-       bool
-       select IBM_NEW_EMAC_ZMII
-
-config 440GX
-       bool
-
-config 440SP
-       bool
-
-config 440A
-       bool
-       depends on 440GX
-       default y
-
-# 44x errata/workaround config symbols, selected by the CPU models above
-config IBM440EP_ERR42
-       bool
-
 #config XILINX_OCP
 #      bool
 #      depends on XILINX_ML300

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index e4b2aee53a73f2ce9815b5d63e19b318c44de006..643bee223ec5400ecd52fff73fc668f4b640735b 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -40,6 +40,7 @@ config PPC_8xx
 config 40x
        bool "AMCC 40x"
        select PPC_DCR_NATIVE
+       select WANT_DEVICE_TREE
 
 config 44x
        bool "AMCC 44x"