From 51837d6cbd437cee2ea4ba9d326a92ae9eaaf3f4 Mon Sep 17 00:00:00 2001
From: Victor Gallardo <vgallardo@amcc.com>
Date: Wed, 1 Oct 2008 23:29:06 -0700
Subject: [PATCH] --- yaml --- r: 114584 b: refs/heads/master c:
 e00de30a9decf48793ac83173144884a1f33de82 h: refs/heads/master v: v3

---
 [refs]                                          |  2 +-
 trunk/arch/powerpc/platforms/44x/Kconfig        | 17 +++++++++++++++--
 .../arch/powerpc/platforms/44x/ppc44x_simple.c  |  3 ++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f328f1049c98..e852a14f0513 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e3cb29497561c846d0e7efc445731764d93c749
+refs/heads/master: e00de30a9decf48793ac83173144884a1f33de82
diff --git a/trunk/arch/powerpc/platforms/44x/Kconfig b/trunk/arch/powerpc/platforms/44x/Kconfig
index f8ef279f3256..79c1154f88d4 100644
--- a/trunk/arch/powerpc/platforms/44x/Kconfig
+++ b/trunk/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/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c b/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c
index 57e71203d0f8..29671262801f 100644
--- a/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c
+++ b/trunk/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",