浏览代码

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>
Josh Boyer 16 年之前
父节点
当前提交
ded563cf45
共有 3 个文件被更改,包括 13 次插入1 次删除
  1. 1 1
      arch/powerpc/boot/dts/glacier.dts
  2. 11 0
      arch/powerpc/platforms/44x/Kconfig
  3. 1 0
      arch/powerpc/platforms/44x/ppc44x_simple.c

+ 1 - 1
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 {

+ 11 - 0
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

+ 1 - 0
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",