Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

6 files changed, 33 insertions, 4 deletions

diff --git a/recipes/kexec/kexec-tools-klibc-static_2.0.0.bb b/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb
index da12db185b..d2bc135902 100644
--- a/recipes/kexec/kexec-tools-klibc-static_2.0.0.bb
+++ b/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r0"
 DEPENDS = "klibc"
 
-SRC_URI += "file://kexec2-klibc.patch;patch=1"
+#SRC_URI += "file://kexec2-klibc.patch;patch=1"
 S = "${WORKDIR}/kexec-tools-${PV}"
 
 EXTRA_OECONF = " --without-zlib"
diff --git a/recipes/kexec/kexec-tools_2.0.0.bb b/recipes/kexec/kexec-tools_2.0.1.bb
index 7692081d24..7692081d24 100644
--- a/recipes/kexec/kexec-tools_2.0.0.bb
+++ b/recipes/kexec/kexec-tools_2.0.1.bb
diff --git a/recipes/linux/linux-2.6.29/boc01/boc01.dts b/recipes/linux/linux-2.6.29/boc01/boc01.dts
index 2066652695..fb0b5fb0a5 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
index fb0b5fb0a5..2066652695 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-palmpre_2.6.24.bb b/recipes/linux/linux-palmpre_2.6.24.bb
new file mode 100644
index 0000000000..9d5bc20a41
--- /dev/null
+++ b/recipes/linux/linux-palmpre_2.6.24.bb
@@ -0,0 +1,15 @@
+require linux.inc
+
+DESCRIPTION = "Linux kernel for Palm Pre. Original version of Palm, Inc."
+KERNEL_IMAGETYPE = "uImage"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+           http://palm.cdnetworks.net/opensource/1.1.0/linux-2.6.24-patch.gz;patch=1 \
+           "
+
+S = "${WORKDIR}/linux-2.6.24"
+
+# We try to build the identical kernel as Palms here, use their defconfig.
+do_configure_prepend() {
+        install -m 0644 ${S}/arch/arm/configs/omap_sirloin_3430_defconfig ${WORKDIR}/defconfig
+}
diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb
index 2e9e769820..ba50a9b3a2 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
+}
+