[oe-commits] org.oe.dev linux-openmoko-devel: revert back to using the u-boot uncompressor, since

[mickeyl commit]

linux-openmoko-devel: revert back to using the u-boot uncompressor, since
the kernel uncompressor triggers a hang (see http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=874)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 98d3a1902bb89e93fa52bcf9b2493b52b64561b5
ViewMTN: http://monotone.openembedded.org/revision/info/98d3a1902bb89e93fa52bcf9b2493b52b64561b5
Files:
1
packages/linux/linux-openmoko-devel_svn.bb
Diffs:

#
# mt diff -r20a6116adbf44e9ecc344e69da811e67a80b8076 -r98d3a1902bb89e93fa52bcf9b2493b52b64561b5
#
# 
# 
# patch "packages/linux/linux-openmoko-devel_svn.bb"
#  from [0c4e0a1a3b5984a92e7255acd3c74e12e71fd37f]
#    to [377566e2cac26889f083dae7e4b7e6f9f3c16906]
# 
============================================================
--- packages/linux/linux-openmoko-devel_svn.bb	0c4e0a1a3b5984a92e7255acd3c74e12e71fd37f
+++ packages/linux/linux-openmoko-devel_svn.bb	377566e2cac26889f083dae7e4b7e6f9f3c16906
@@ -16,6 +16,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http;name=patches \
            file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \
+           file://printascii.patch;patch=1 \
            file://defconfig \
            file://logo_linux_clut224.ppm"
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
@@ -52,3 +53,19 @@ addtask prepatch after do_unpack before 
 
 addtask prepatch after do_unpack before do_patch
 
+###############################################################
+# put into deploy directory and append u-boot header
+#
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
+        ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+        rm -f linux.bin.gz
+        gzip -9 linux.bin
+        ${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973" \
+                                               -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+        ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin
+        rm -f linux.bin.gz
+}
+