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

8 files changed, 71 insertions, 7 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 41e099da12..2dcb04380d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -12306,9 +12306,9 @@ sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d
 md5=b4f7ffcc294d41a6a4c40d6e44b7734d
 sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38
 
-[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.0.tar.gz]
-md5=bf87c53f36b4454ad3cc50aa9c72faf3
-sha256=f8244b8c4691faf0c9765ec3acba730a5620c8077f9bed667b9ac835dd959ba2
+[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.1.tar.gz]
+md5=a7710a89fb0096002bccc57ab202a874
+sha256=95f352870df977271d912b6093f034bd3345e47a157493db96d1047b7654564d
 
 [http://kexecboot.home.linuxtogo.org/kexecboot-0.3.tar.gz]
 md5=3c3b8edb739146183b3ddff3e0af5f1c
@@ -16082,6 +16082,10 @@ sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
 md5=f0e143ed696bb064804cf0970718b414
 sha256=7aad0d9df138fa99332a82ca69eb07504b04e9b0a3cdb405ce872ca3bd4f44ac
 
+[http://palm.cdnetworks.net/opensource/1.1.0/linux-2.6.24-patch.gz]
+md5=1c5547aa497a7eae9fa52ed4df4b0f11
+sha256=5f7c232f9216ce45f0ab0045098cd2b21b6f2f8a7668bffd2e06040a5b87ba84
+
 [http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.3.atmel.3.tar.bz2]
 md5=952715cc523f4a77e7c5f94f608594c0
 sha256=d26a1de101692958fbca1d1be40fe52bd605636baea616a3e8ed96e422a3648d
diff --git a/conf/machine/palmpre.conf b/conf/machine/palmpre.conf
new file mode 100644
index 0000000000..fe3c2794ee
--- /dev/null
+++ b/conf/machine/palmpre.conf
@@ -0,0 +1,31 @@
+#@TYPE: Machine
+#@NAME: Palm Pre machine
+#@DESCRIPTION: Machine configuration for the Palm Pre handset
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "185"
+
+require conf/machine/include/omap3.inc
+
+# Put it below omap3.inc as we override the kernel here
+PREFERRED_PROVIDER_virtual/kernel = "linux-palmpre"
+
+
+IMAGE_FSTYPES += "tar.bz2"
+
+# Let's keep the following three from the beagleboard machine config
+UBOOT_MACHINE = "omap3_beagle_config"
+PREFERRED_VERSION_u-boot = "git"
+MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
+
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone bluetooth touchscreen keyboard wifi"
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
+}
+