linux-openmoko.inc : gta01/02 wont use the same partition map going into

the future so use /proc/mtd to find the kernel partition.

diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index baa2e55dc1d500460c37133dcec98d8bcdfabaa4..ad0c64bef2912f2349e6db13cbfe382050556765 100644 (file)
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -44,6 +44,3 @@ 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 2b2d0160890a6f735bdb29ff48507179408db528..dad60e20c82e25dbb9f9fca2cc84d081fbec4bc1 100644 (file)
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -46,6 +46,3 @@ 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 b659153733568988738fb24837d302bf2f24af9d..2016acdb63cbe9525775d41f7b713e8d054657c0 100644 (file)
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -15,8 +15,11 @@ 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}
+       MTD_KERNEL_PARTITION=`cat /proc/mtd | grep kernel | cut -d':' -f1`
+       MTD_KERNEL_PARTITION=/dev/$MTD_KERNEL_PARTITION
+
+       ${bindir}/flash_eraseall $MTD_KERNEL_PARTITION
+       ${bindir}/nandwrite -p $MTD_KERNEL_PARTITION /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
 fi
 }