Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 44x / Kconfig

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 249ba01c667416cfb62f8743f2701f087732b088..3496bc05058ed63bef9773f843b97fb4b16fd642 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -2,6 +2,7 @@ config BAMBOO
        bool "Bamboo"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440EP
        select PCI
        help
@@ -30,6 +31,7 @@ config SEQUOIA
        bool "Sequoia"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440EPX
        help
          This option enables support for the AMCC PPC440EPX evaluation board.
@@ -38,6 +40,7 @@ config TAISHAN
        bool "Taishan"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440GX
        select PCI
        help
@@ -48,6 +51,7 @@ config KATMAI
        bool "Katmai"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440SPe
        select PCI
        select PPC4xx_PCI_EXPRESS
@@ -58,6 +62,7 @@ config RAINIER
        bool "Rainier"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440GRX
        select PCI
        help
@@ -76,20 +81,48 @@ config WARP
          See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
          Telephony Developers" link for more information.
 
+config ARCHES
+       bool "Arches"
+       depends on 44x
+       default n
+       select PPC44x_SIMPLE
+       select 460EX # Odd since it uses 460GT but the effects are the same
+       select PCI
+       select PPC4xx_PCI_EXPRESS
+       help
+         This option enables support for the AMCC Dual PPC460GT evaluation board.
+
 config CANYONLANDS
        bool "Canyonlands"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 460EX
        select PCI
        select PPC4xx_PCI_EXPRESS
+       select IBM_NEW_EMAC_RGMII
+       select IBM_NEW_EMAC_ZMII
        help
          This option enables support for the AMCC PPC460EX evaluation board.
 
+config GLACIER
+       bool "Glacier"
+       depends on 44x
+       default n
+       select PPC44x_SIMPLE
+       select 460EX # Odd since it uses 460GT but the effects are the same
+       select PCI
+       select PPC4xx_PCI_EXPRESS
+       select IBM_NEW_EMAC_RGMII
+       select IBM_NEW_EMAC_ZMII
+       help
+         This option enables support for the AMCC PPC460GT evaluation board.
+
 config YOSEMITE
        bool "Yosemite"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440EP
        select PCI
        help
@@ -127,6 +160,21 @@ config XILINX_VIRTEX440_GENERIC_BOARD
          Most Virtex 5 designs should use this unless it needs to do some
          special configuration at board probe time.
 
+config PPC44x_SIMPLE
+       bool "Simple PowerPC 44x board support"
+       depends on 44x
+       default n
+       help
+         This option enables the simple PowerPC 44x platform support.
+
+config PPC4xx_GPIO
+       bool "PPC4xx GPIO support"
+       depends on 44x
+       select ARCH_REQUIRE_GPIOLIB
+       select GENERIC_GPIO
+       help
+         Enable gpiolib support for ppc440 based boards
+
 # 44x specific CPU modules, selected based on the board above.
 config 440EP
        bool
@@ -170,8 +218,6 @@ config 460EX
        bool
        select PPC_FPU
        select IBM_NEW_EMAC_EMAC4
-       select IBM_NEW_EMAC_RGMII
-       select IBM_NEW_EMAC_ZMII
        select IBM_NEW_EMAC_TAH
 
 # 44x errata/workaround config symbols, selected by the CPU models above