aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-04-14 14:59:44 -0600
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-04-14 17:36:14 -0400
commit993916203f00e8c62599466a5caa866e09f0fae3 (patch)
tree63faf4dec0635f6c0911055d277165fee5acc222
parent7f9eed8ee4d22be7280adda8f8fc78325c53719f (diff)
arm/dt: vexpress: Update basic DT to use skeleton.dtsi file.
Converted .dts file to use skeleton.dtsi, and added 'dtbs' target. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
-rw-r--r--arch/arm/boot/dts/vexpress.dts10
-rw-r--r--arch/arm/mach-vexpress/Makefile.boot2
2 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/vexpress.dts b/arch/arm/boot/dts/vexpress.dts
index bea2a18f361..5f3bc1d1f1c 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 07c2d9c457e..9920a1053e2 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