summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/fic-gta01.conf4
-rw-r--r--conf/machine/fic-gta02.conf4
-rw-r--r--packages/linux/linux-openmoko.inc15
-rw-r--r--packages/linux/linux-openmoko_2.6.22.5.bb1
4 files changed, 22 insertions, 2 deletions
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 09517fd11d..30784f0dc6 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -47,3 +47,7 @@ EXTRA_IMAGEDEPENDS += "dfu-util-native"
# tune for S3C24x0
include conf/machine/include/tune-arm920t.inc
+
+# set partition to flash kernel into
+MTD_KERNEL_PARTITION = "/dev/mtd2"
+
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 4cad7924f1..b0933868c2 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -49,3 +49,7 @@ include conf/machine/include/tune-arm920t.inc
# build YAFFS2
IMAGE_FSTYPES ?= "jffs2 yaffs2"
+
+# set partition to flash kernel into
+MTD_KERNEL_PARTITION = "/dev/mtd2"
+
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index d08169999c..b659153733 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -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
+}
+
diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index c623504c73..d1b3c5ef1e 100644
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -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"