---

yaml --- r: 326717 b: refs/heads/master c: 434e1c5 h: refs/heads/master i: 326715: d14a14b v: v3
git-mirror · Sep 5, 2012 · 113d696 · 113d696
1 parent 9142de9
commit 113d696
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 500b6ae3c1edbc8fc7a3ba551f9e09acffaa4304
+refs/heads/master: 434e1c574cc304eaff630f4e92ed239f7886815f
diff --git a/trunk/arch/arm/boot/dts/prima2-cb.dts → trunk/arch/arm/boot/dts/prima2.dtsi b/trunk/arch/arm/boot/dts/prima2-cb.dts → trunk/arch/arm/boot/dts/prima2.dtsi
@@ -1,20 +1,18 @@
-/dts-v1/;
+/*
+ * DTS file for CSR SiRFprimaII SoC
+ *
+ * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company.
+ *
+ * Licensed under GPLv2 or later.
+ */
+
+/include/ "skeleton.dtsi"
 / {
-	model = "SiRF Prima2 eVB";
-	compatible = "sirf,prima2-cb", "sirf,prima2";
+	compatible = "sirf,prima2";
 	#address-cells = <1>;
 	#size-cells = <1>;
 	interrupt-parent = <&intc>;
 
-	memory {
-		reg = <0x00000000 0x20000000>;
-	};
-
-	chosen {
-		bootargs = "mem=512M real_root=/dev/mmcblk0p2 console=ttyS0 panel=1 bootsplash=true bpp=16 androidboot.console=ttyS1";
-		linux,stdout-path = &uart1;
-	};
-
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;