powerpc/44x: Add explicit support for AMCC Glacier

Add explicit support for the AMCC Glacier eval board to Kconfig and the
ppc44x_simple file.  Also removes the cayonlands compatible entry from the
DTS file.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

3 files changed, 13 insertions, 1 deletions

diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index 24cf0dba120c..f3787a27f634 100644
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -14,7 +14,7 @@
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,glacier";
-        compatible = "amcc,glacier", "amcc,canyonlands";
+        compatible = "amcc,glacier";
         dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index e0bea834bfe5..f8ef279f3256 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -92,6 +92,17 @@ config CANYONLANDS
         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
+        help
+          This option enables support for the AMCC PPC460GT evaluation board.
+
 config YOSEMITE
         bool "Yosemite"
         depends on 44x
diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c
index 32b0535f29fe..1c064b242cf0 100644
--- a/arch/powerpc/platforms/44x/ppc44x_simple.c
+++ b/arch/powerpc/platforms/44x/ppc44x_simple.c
@@ -52,6 +52,7 @@ machine_device_initcall(ppc44x_simple, ppc44x_device_probe);
 static char *board[] __initdata = {
         "amcc,bamboo",
         "amcc,cayonlands",
+        "amcc,glacier",
         "ibm,ebony",
         "amcc,katmai",
         "amcc,rainier",