---

yaml --- r: 303508 b: refs/heads/master c: 7296d93 h: refs/heads/master v: v3
git-mirror · May 14, 2012 · 06c28a9 · 06c28a9
1 parent 8053b15
commit 06c28a9
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 953 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c437430f1493b77f5fd3cbc1473b7bdc9686b91
+refs/heads/master: 7296d93201710865233fbebf7c9853d2f95d7716
diff --git a/.../arm/boot/dts/r8a7740-armadillo800eva.dts → trunk/arch/arm/boot/dts/sh73a0-kzm9g.dts b/.../arm/boot/dts/r8a7740-armadillo800eva.dts → trunk/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -1,5 +1,5 @@
 /*
- * Device Tree Source for the armadillo 800 eva board
+ * Device Tree Source for the KZM-A9-GT board
  *
  * Copyright (C) 2012 Renesas Solutions Corp.
  *
@@ -12,11 +12,11 @@
 /include/ "skeleton.dtsi"
 
 / {
-	model = "armadillo 800 eva";
-	compatible = "renesas,armadillo800eva";
+	model = "KZM-A9-GT";
+	compatible = "renesas,kzm9g";
 
 	memory {
 		device_type = "memory";
-		reg = <0x40000000 0x20000000>;
+		reg = <0x41000000 0x1e800000>;
 	};
 };
diff --git a/trunk/arch/arm/configs/armadillo800eva_defconfig b/trunk/arch/arm/configs/armadillo800eva_defconfig
diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig
@@ -93,12 +93,6 @@ config MACH_BONITO
 	select ARCH_REQUIRE_GPIOLIB
 	depends on ARCH_R8A7740
 
-config MACH_ARMADILLO800EVA
-	bool "Armadillo-800 EVA board"
-	depends on ARCH_R8A7740
-	select ARCH_REQUIRE_GPIOLIB
-	select USE_OF
-
 config MACH_MARZEN
 	bool "MARZEN board"
 	depends on ARCH_R8A7779
@@ -108,6 +102,7 @@ config MACH_KZM9G
 	bool "KZM-A9-GT board"
 	depends on ARCH_SH73A0
 	select ARCH_REQUIRE_GPIOLIB
+	select USE_OF
 
 comment "SH-Mobile System Configuration"
 
@@ -121,8 +116,7 @@ config MEMORY_START
 	hex "Physical memory start address"
 	default "0x50000000" if MACH_G3EVM
 	default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \
-				MACH_MACKEREL || MACH_BONITO || \
-				MACH_ARMADILLO800EVA
+				MACH_MACKEREL || MACH_BONITO
 	default "0x41000000" if MACH_KOTA2
 	default "0x00000000"
 	---help---
@@ -134,8 +128,7 @@ config MEMORY_SIZE
 	hex "Physical memory size"
 	default "0x08000000" if MACH_G3EVM
 	default "0x08000000" if MACH_G4EVM
-	default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \
-				MACH_ARMADILLO800EVA
+	default "0x20000000" if MACH_AG5EVM || MACH_BONITO
 	default "0x1e000000" if MACH_KOTA2
 	default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL
 	default "0x04000000"

diff --git a/trunk/arch/arm/mach-shmobile/Makefile b/trunk/arch/arm/mach-shmobile/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o
 obj-$(CONFIG_MACH_KOTA2)	+= board-kota2.o
 obj-$(CONFIG_MACH_BONITO)	+= board-bonito.o
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
-obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o
 obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o
 
 # Framework support