From b6330a62816f4f43088e73dac8d235f6307fb34d Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 19 Aug 2008 11:27:01 -0400 Subject: [PATCH] --- yaml --- r: 114537 b: refs/heads/master c: ded563cf458e7803536f9d7b6bc5d808a6e37f21 h: refs/heads/master i: 114535: 90cf36c245ee2abeb76aa30b222e2cbc2f698456 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/dts/glacier.dts | 2 +- trunk/arch/powerpc/platforms/44x/Kconfig | 11 +++++++++++ trunk/arch/powerpc/platforms/44x/ppc44x_simple.c | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 34fa2f41d111..723098f3cdae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f19a897c740e2a2e98f40b60055d56d8e437f6f +refs/heads/master: ded563cf458e7803536f9d7b6bc5d808a6e37f21 diff --git a/trunk/arch/powerpc/boot/dts/glacier.dts b/trunk/arch/powerpc/boot/dts/glacier.dts index 24cf0dba120c..f3787a27f634 100644 --- a/trunk/arch/powerpc/boot/dts/glacier.dts +++ b/trunk/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/trunk/arch/powerpc/platforms/44x/Kconfig b/trunk/arch/powerpc/platforms/44x/Kconfig index e0bea834bfe5..f8ef279f3256 100644 --- a/trunk/arch/powerpc/platforms/44x/Kconfig +++ b/trunk/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/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c b/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c index 32b0535f29fe..1c064b242cf0 100644 --- a/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/trunk/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",