[oe-commits] org.oe.dev linux-openmoko_2.6.22.5.bb : commit the work for OM bug #910 now people

[xora commit]

linux-openmoko_2.6.22.5.bb : commit the work for OM bug #910 now people
have had plenty of warning. Now kernel-image will flash new kernel in
postinst. Its noisy and leaves the kernel in / for now to ease debugging
of any problems people have.

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 61be8a30e820dc54cfed12990b318566651273fc
ViewMTN: http://monotone.openembedded.org/revision/info/61be8a30e820dc54cfed12990b318566651273fc
Files:
1
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/linux/linux-openmoko.inc
packages/linux/linux-openmoko_2.6.22.5.bb
Diffs:

#
# mt diff -r9f549d07dc4c9fb0a26eb9f91bcbcc74e588f631 -r61be8a30e820dc54cfed12990b318566651273fc
#
# 
# 
# patch "conf/machine/fic-gta01.conf"
#  from [311b643887ee0c43d493005b0f793da96a73d3db]
#    to [56e3567a9b043a97909716a4bb78777a1f1f48a2]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [183b99c3f30071b0f75ef710bb50bda92bb21077]
#    to [5a64c25ce56c6c837bea67eadf19100fe0d59337]
# 
# patch "packages/linux/linux-openmoko.inc"
#  from [1ea30a4afd856ca9ab5f4ee04ae06a0e9171ddd1]
#    to [34dcf04d7cd99710c9be2c93e3d8508829246532]
# 
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
#  from [cf4bec2bd369c8bb8d1c434003bd0947e4520cfa]
#    to [10ba1238090620db23914c0dccd22badc39f2ce4]
# 
============================================================
--- conf/machine/fic-gta01.conf	311b643887ee0c43d493005b0f793da96a73d3db
+++ conf/machine/fic-gta01.conf	56e3567a9b043a97909716a4bb78777a1f1f48a2
@@ -47,3 +47,7 @@ include conf/machine/include/tune-arm920
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
+
+# set partition to flash kernel into
+MTD_KERNEL_PARTITION = "/dev/mtd2"
+
============================================================
--- conf/machine/fic-gta02.conf	183b99c3f30071b0f75ef710bb50bda92bb21077
+++ conf/machine/fic-gta02.conf	5a64c25ce56c6c837bea67eadf19100fe0d59337
@@ -49,3 +49,7 @@ IMAGE_FSTYPES ?= "jffs2 yaffs2"
 
 # build YAFFS2
 IMAGE_FSTYPES ?= "jffs2 yaffs2"
+
+# set partition to flash kernel into
+MTD_KERNEL_PARTITION = "/dev/mtd2"
+
============================================================
--- packages/linux/linux-openmoko.inc	1ea30a4afd856ca9ab5f4ee04ae06a0e9171ddd1
+++ packages/linux/linux-openmoko.inc	34dcf04d7cd99710c9be2c93e3d8508829246532
@@ -1,5 +1,4 @@
 # extra stuff we need for openmoko that is not in linux.inc
-
 do_deploy_append() {
 	mv ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz
 	mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin
@@ -7,3 +6,17 @@ do_deploy_append() {
 	ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin
 }
 
+RDEPENDS_kernel-image += "mtd-utils"
+
+pkg_postinst_kernel-image () {
+if test "x$D" != "x"; then
+        exit 1
+else
+	echo "Upgrading Kernel in Flash"
+	echo "DO NOT stop this process"
+
+	${bindir}/flash_eraseall ${MTD_KERNEL_PARTITION}
+	${bindir}/nandwrite -p ${MTD_KERNEL_PARTITION} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
+fi
+}
+
============================================================
--- packages/linux/linux-openmoko_2.6.22.5.bb	cf4bec2bd369c8bb8d1c434003bd0947e4520cfa
+++ packages/linux/linux-openmoko_2.6.22.5.bb	10ba1238090620db23914c0dccd22badc39f2ce4
@@ -37,7 +37,6 @@ S = "${WORKDIR}/linux-${VANILLA_VERSION}
 ##############################################################
 # kernel image resides on a seperate flash partition (for now)
 #
-FILES_kernel-image = ""
 ALLOW_EMPTY = "1"
 
 COMPATIBLE_HOST = "arm.*-linux"