[2/2] arm/dt: vexpress: Update basic DT to use skeleton.dtsi file.

Message ID 20110414205944.10689.75524.stgit@ponder
State New
Headers show

Commit Message

Grant Likely April 14, 2011, 8:59 p.m.
Converted .dts file to use skeleton.dtsi, and added 'dtbs' target.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
 arch/arm/boot/dts/vexpress.dts       |   10 +---------
 arch/arm/mach-vexpress/Makefile.boot |    2 ++
 2 files changed, 3 insertions(+), 9 deletions(-)

Patch

diff --git a/arch/arm/boot/dts/vexpress.dts b/arch/arm/boot/dts/vexpress.dts
index bea2a18..5f3bc1d 100644
--- a/arch/arm/boot/dts/vexpress.dts
+++ b/arch/arm/boot/dts/vexpress.dts
@@ -1,18 +1,10 @@ 
 /dts-v1/;
+/include/ "skeleton.dtsi"
 
 / {
 	model = "ARM Versatile Express";
 	compatible = "arm,vexpress";
-
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	aliases { };
-
-	chosen { };
-
 	memory {
-		device_type = "memory";
 		reg = <0x60000000 0x40000000>;
 	};
 };
diff --git a/arch/arm/mach-vexpress/Makefile.boot b/arch/arm/mach-vexpress/Makefile.boot
index 07c2d9c..9920a10 100644
--- a/arch/arm/mach-vexpress/Makefile.boot
+++ b/arch/arm/mach-vexpress/Makefile.boot
@@ -1,3 +1,5 @@ 
    zreladdr-y	:= 0x60008000
 params_phys-y	:= 0x60000100
 initrd_phys-y	:= 0x60800000
+
+dtb-$(CONFIG_ARCH_VEXPRESS_CA9X4) += vexpress.dtb