From 6a96d189f181e57619d0c20cbae1b926953f10d9 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 25 Aug 2006 10:16:16 +0000
Subject: handhelds-pxa-2.6-cvs: bump version to 2.6.17-hh0

---
 packages/linux/handhelds-pxa-2.6_cvs.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index 7dfcb4d237..75f4425638 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -27,8 +27,8 @@ ALLOW_EMPTY_htcuniversal = 1
 
 K_MAJOR = "2"
 K_MINOR = "6"
-K_MICRO = "16"
-HHV     = "5"
+K_MICRO = "17"
+HHV     = "0"
 #
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
-- 
cgit v1.2.3


From 4f1963886d9d2227be98a4473ceefc9c1011d1fd Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@balister.org>
Date: Fri, 25 Aug 2006 18:03:06 +0000
Subject: linux-omap1_2.6.12-rc2.bb : Fixes so it builds reliably   * add
 dependency on u-boot   * Fix do_deploy to massage kernel for use on
 omap5912osk board

---
 packages/linux/linux-omap1_2.6.12-rc2.bb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb
index 7ea9e16091..46e7d0ba95 100644
--- a/packages/linux/linux-omap1_2.6.12-rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12-rc2.bb
@@ -14,7 +14,7 @@ KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
 KERNEL_CCSUFFIX = "-3.3.4"
 
-#DEPENDS = "uboot"
+DEPENDS = "u-boot"
 
 inherit kernel
 
@@ -25,13 +25,17 @@ do_configure_prepend() {
         oe_runmake oldconfig
 }
 
-do_deploy_omap5912osk() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR}/linux.bin
-        gzip -f -9 ${DEPLOY_DIR}/linux.bin
-        mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR}/linux.bin.gz ${DEPLOY_DIR}/uImage_bb.cc
-        cp ${DEPLOY_DIR}/uImage_bb.cc /tftpboot
-#        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+do_deploy() {
+        if [ "${MACHINE}" == "omap5912osk" ]; then
+                install -d ${DEPLOY_DIR_IMAGE}
+                arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin
+                gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
+                mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+                rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz
+
+#               cp ${DEPLOY_DIR}/uImage_bb.cc /tftpboot
+#               install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        fi
 }
 
 
-- 
cgit v1.2.3