[oe-commits] Jeremy Lainé : linux-2.6.29: add devicetree image for boc01 v1 and v2

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: aaef70f186aa239669269a8a4237b6d3dc99b5f5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=aaef70f186aa239669269a8a4237b6d3dc99b5f5

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Thu Sep 24 19:10:28 2009 +0200

linux-2.6.29: add devicetree image for boc01 v1 and v2

---

 recipes/linux/linux-2.6.29/boc01/boc01.dts         |    2 +-
 .../linux-2.6.29/boc01/{boc02.dts => boc01.dts.v1} |    2 +-
 recipes/linux/linux_2.6.29.bb                      |   16 +++++++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/recipes/linux/linux-2.6.29/boc01/boc01.dts b/recipes/linux/linux-2.6.29/boc01/boc01.dts
index 2066652..fb0b5fb 100644
--- a/recipes/linux/linux-2.6.29/boc01/boc01.dts
+++ b/recipes/linux/linux-2.6.29/boc01/boc01.dts
@@ -194,7 +194,7 @@
 			compatible = "gianfar";
 			reg = <0x25000 0x1000>;
 			local-mac-address = [ 00 00 00 00 00 00 ];
-			interrupts = <34 0x8 33 0x8 32 0x8>;
+			interrupts = <35 0x8 36 0x8 37 0x8>;
 			interrupt-parent = <&ipic>;
 			fixed-link = <1 1 100 0 0>;
 			sleep = <&pmc 0x10000000>;
diff --git a/recipes/linux/linux-2.6.29/boc01/boc02.dts b/recipes/linux/linux-2.6.29/boc01/boc01.dts.v1
similarity index 99%
rename from recipes/linux/linux-2.6.29/boc01/boc02.dts
rename to recipes/linux/linux-2.6.29/boc01/boc01.dts.v1
index fb0b5fb..2066652 100644
--- a/recipes/linux/linux-2.6.29/boc01/boc02.dts
+++ b/recipes/linux/linux-2.6.29/boc01/boc01.dts.v1
@@ -194,7 +194,7 @@
 			compatible = "gianfar";
 			reg = <0x25000 0x1000>;
 			local-mac-address = [ 00 00 00 00 00 00 ];
-			interrupts = <35 0x8 36 0x8 37 0x8>;
+			interrupts = <34 0x8 33 0x8 32 0x8>;
 			interrupt-parent = <&ipic>;
 			fixed-link = <1 1 100 0 0>;
 			sleep = <&pmc 0x10000000>;
diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb
index 2e9e769..ba50a9b 100644
--- a/recipes/linux/linux_2.6.29.bb
+++ b/recipes/linux/linux_2.6.29.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r8"
+PR = "r9"
 
 S = "${WORKDIR}/linux-2.6.29"
 
@@ -23,6 +23,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 \
 
 SRC_URI_append_boc01 = "\
 	file://boc01.dts \
+	file://boc01.dts.v1 \
 	file://004-081205-usb.patch;patch=1 \
 	file://005-090226-isl12024.patch;patch=1 \
 	file://007-090825-lm73.patch;patch=1 \
@@ -73,3 +74,16 @@ SRC_URI_append_stamp9g20evb = " \
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),0x230000(root),-(config);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd4 rootfstype=jffs2"
 
+do_devicetree_image_append_boc01() {
+	dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree.v1 ${KERNEL_DEVICETREE}.v1
+	install -m 0644 devicetree.v1 ${D}/boot/devicetree-${KERNEL_VERSION}.v1
+}
+
+pkg_postinst_kernel-devicetree_append_boc01 () {
+	cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/devicetree.v1 devicetree.v1 devicetree-${KERNEL_VERSION}.v1 ${KERNEL_PRIORITY} || true
+}
+
+pkg_postrm_kernel-devicetree_append_boc01 () {
+	cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree.v1 devicetree-${KERNEL_VERSION}.v1 || true
+}
+