[oe-commits] org.oe.dev linux-openmoko.inc : gta01/02 wont use the same partition map going into

[xora commit]

linux-openmoko.inc : gta01/02 wont use the same partition map going into
the future so use /proc/mtd to find the kernel partition.

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

#
# mt diff -r94437bb621a1aaa9fa9d9f75b1c43ccc29c02676 -r90c7a0b44885dda992a212cab0adbc5079deb8c1
#
# 
# 
# patch "conf/machine/fic-gta01.conf"
#  from [a22cc548559eb5dd955c13162775e39704964189]
#    to [b884bb7e142967c6cfb71b21c05365cd18d0f886]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [426ff7023d259a58a2b2d1d4e019468d2a171a6e]
#    to [47adecd1ee4496da827ee13c515774484b0373ec]
# 
# patch "packages/linux/linux-openmoko.inc"
#  from [34dcf04d7cd99710c9be2c93e3d8508829246532]
#    to [26ac1c3cd91125014bb4e3b9e4f80b93fc877ccb]
# 
============================================================
--- conf/machine/fic-gta01.conf	a22cc548559eb5dd955c13162775e39704964189
+++ conf/machine/fic-gta01.conf	b884bb7e142967c6cfb71b21c05365cd18d0f886
@@ -44,6 +44,3 @@ 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	426ff7023d259a58a2b2d1d4e019468d2a171a6e
+++ conf/machine/fic-gta02.conf	47adecd1ee4496da827ee13c515774484b0373ec
@@ -46,6 +46,3 @@ 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	34dcf04d7cd99710c9be2c93e3d8508829246532
+++ packages/linux/linux-openmoko.inc	26ac1c3cd91125014bb4e3b9e4f80b93fc877ccb
@@ -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
 }