diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-07 11:15:07 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-07 11:15:07 +1100 |
| commit | fa6428ebfa2197841902b89cbc25334707e2f6eb (patch) | |
| tree | d139b822bc5447198528defb29f0c0e90d89651c /arch/powerpc/platforms | |
| parent | c9b59da130b4430910e02a80816f317534cd5e53 (diff) | |
| parent | 3d5fa877bdf65451c78c3b3d581355deea403b80 (diff) | |
Merge commit 'jwb/jwb-next'
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 17 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/ppc44x_simple.c | 3 |
2 files changed, 17 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index f8ef279f325..79c1154f88d 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -81,6 +81,17 @@ 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 @@ -89,6 +100,8 @@ config CANYONLANDS 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. @@ -100,6 +113,8 @@ config GLACIER 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. @@ -195,8 +210,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 diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c index 57e71203d0f..29671262801 100644 --- a/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/arch/powerpc/platforms/44x/ppc44x_simple.c @@ -50,8 +50,9 @@ machine_device_initcall(ppc44x_simple, ppc44x_device_probe); * board.c file for it rather than adding it to this list. */ static char *board[] __initdata = { + "amcc,arches", "amcc,bamboo", - "amcc,cayonlands", + "amcc,canyonlands", "amcc,glacier", "ibm,ebony", "amcc,katmai", |