aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-12-28 15:40:44 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-12-28 15:40:44 +0000
commit3d162b61c086964bad7427a33d6750c6de1eee11 (patch)
treeba65ea0ef5609b39bd99d9013bb168a031608eae
parent67cfacda7b1c0d62a332f59a699c6effd54da902 (diff)
downloadupstream-3d162b61c086964bad7427a33d6750c6de1eee11.tar.gz
upstream-3d162b61c086964bad7427a33d6750c6de1eee11.tar.bz2
upstream-3d162b61c086964bad7427a33d6750c6de1eee11.zip
add cf2nand fixes from #2892
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9985 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xtarget/linux/rb532/base-files/sbin/cf2nand6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/rb532/base-files/sbin/cf2nand b/target/linux/rb532/base-files/sbin/cf2nand
index fb3717499b..146aa4f112 100755
--- a/target/linux/rb532/base-files/sbin/cf2nand
+++ b/target/linux/rb532/base-files/sbin/cf2nand
@@ -28,8 +28,8 @@ mount -t "$fstype" /dev/root /tmp/cf2nand/rootfs || {
exit 1
}
-boot="$(find_mtd_part 'RouterBoard NAND Boot')"
-main="$(find_mtd_part 'RouterBoard NAND Main')"
+boot="$(find_mtd_part 'Routerboard NAND boot')"
+main="$(find_mtd_part 'rootfs')"
[ -z "$boot" -o -z "$main" ] && {
echo "Cannot find NAND Flash partitions"
exit 1
@@ -45,7 +45,7 @@ mount -t yaffs2 "$boot" /tmp/cf2nand/p1
mount -t yaffs2 "$main" /tmp/cf2nand/p2
echo "Copying kernel..."
-copy_kernel /dev/cf/card0/part1 /tmp/cf2nand/p1/kernel "root=/dev/mtdblock1 rootfstype=yaffs2 init=/etc/preinit " 2>/dev/null >/dev/null
+copy_kernel /dev/cfa1 /tmp/cf2nand/p1/kernel "root=/dev/mtdblock1 rootfstype=yaffs2 init=/etc/preinit " 2>/dev/null >/dev/null
umount /tmp/cf2nand/p1
rmdir /tmp/cf2nand/p1