diff options
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 | |||
81 | See http://www.pikatechnologies.com/ and follow the "PIKA for Computer | 81 | See http://www.pikatechnologies.com/ and follow the "PIKA for Computer |
82 | Telephony Developers" link for more information. | 82 | Telephony Developers" link for more information. |
83 | 83 | ||
84 | config ARCHES | ||
85 | bool "Arches" | ||
86 | depends on 44x | ||
87 | default n | ||
88 | select PPC44x_SIMPLE | ||
89 | select 460EX # Odd since it uses 460GT but the effects are the same | ||
90 | select PCI | ||
91 | select PPC4xx_PCI_EXPRESS | ||
92 | help | ||
93 | This option enables support for the AMCC Dual PPC460GT evaluation board. | ||
94 | |||
84 | config CANYONLANDS | 95 | config CANYONLANDS |
85 | bool "Canyonlands" | 96 | bool "Canyonlands" |
86 | depends on 44x | 97 | depends on 44x |
@@ -89,6 +100,8 @@ config CANYONLANDS | |||
89 | select 460EX | 100 | select 460EX |
90 | select PCI | 101 | select PCI |
91 | select PPC4xx_PCI_EXPRESS | 102 | select PPC4xx_PCI_EXPRESS |
103 | select IBM_NEW_EMAC_RGMII | ||
104 | select IBM_NEW_EMAC_ZMII | ||
92 | help | 105 | help |
93 | This option enables support for the AMCC PPC460EX evaluation board. | 106 | This option enables support for the AMCC PPC460EX evaluation board. |
94 | 107 | ||
@@ -100,6 +113,8 @@ config GLACIER | |||
100 | select 460EX # Odd since it uses 460GT but the effects are the same | 113 | select 460EX # Odd since it uses 460GT but the effects are the same |
101 | select PCI | 114 | select PCI |
102 | select PPC4xx_PCI_EXPRESS | 115 | select PPC4xx_PCI_EXPRESS |
116 | select IBM_NEW_EMAC_RGMII | ||
117 | select IBM_NEW_EMAC_ZMII | ||
103 | help | 118 | help |
104 | This option enables support for the AMCC PPC460GT evaluation board. | 119 | This option enables support for the AMCC PPC460GT evaluation board. |
105 | 120 | ||
@@ -195,8 +210,6 @@ config 460EX | |||
195 | bool | 210 | bool |
196 | select PPC_FPU | 211 | select PPC_FPU |
197 | select IBM_NEW_EMAC_EMAC4 | 212 | select IBM_NEW_EMAC_EMAC4 |
198 | select IBM_NEW_EMAC_RGMII | ||
199 | select IBM_NEW_EMAC_ZMII | ||
200 | select IBM_NEW_EMAC_TAH | 213 | select IBM_NEW_EMAC_TAH |
201 | 214 | ||
202 | # 44x errata/workaround config symbols, selected by the CPU models above | 215 | # 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); | |||
50 | * board.c file for it rather than adding it to this list. | 50 | * board.c file for it rather than adding it to this list. |
51 | */ | 51 | */ |
52 | static char *board[] __initdata = { | 52 | static char *board[] __initdata = { |
53 | "amcc,arches", | ||
53 | "amcc,bamboo", | 54 | "amcc,bamboo", |
54 | "amcc,cayonlands", | 55 | "amcc,canyonlands", |
55 | "amcc,glacier", | 56 | "amcc,glacier", |
56 | "ibm,ebony", | 57 | "ibm,ebony", |
57 | "amcc,katmai", | 58 | "amcc,katmai", |