Commit ded563cf authored by Josh Boyer's avatar Josh Boyer
Browse files

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: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent 4f19a897

arch/powerpc/boot/dts/glacier.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ / { 
	#address-cells = <2>;

	#address-cells = <2>;

	#size-cells = <1>;

	#size-cells = <1>;

	model = "amcc,glacier";

	model = "amcc,glacier";

	compatible = "amcc,glacier", "amcc,canyonlands";

	compatible = "amcc,glacier";

	dcr-parent = <&{/cpus/cpu@0}>;

	dcr-parent = <&{/cpus/cpu@0}>;





	aliases {

	aliases {

arch/powerpc/platforms/44x/Kconfig

+11 −0
Original line number Original line Diff line number Diff line
@@ -92,6 +92,17 @@ config CANYONLANDS 
	help

	help

	  This option enables support for the AMCC PPC460EX evaluation board.

	  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

config YOSEMITE

	bool "Yosemite"

	bool "Yosemite"

	depends on 44x

	depends on 44x

arch/powerpc/platforms/44x/ppc44x_simple.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ machine_device_initcall(ppc44x_simple, ppc44x_device_probe); 
static char *board[] __initdata = {

static char *board[] __initdata = {

	"amcc,bamboo",

	"amcc,bamboo",

	"amcc,cayonlands",

	"amcc,cayonlands",

	"amcc,glacier",

	"ibm,ebony",

	"ibm,ebony",

	"amcc,katmai",

	"amcc,katmai",

	"amcc,rainier",

	"amcc,rainier",