summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--board/a9m2440/env/bin/_update2
-rw-r--r--board/a9m2440/env/bin/boot14
-rw-r--r--board/a9m2440/env/bin/update_root2
3 files changed, 9 insertions, 9 deletions
diff --git a/board/a9m2440/env/bin/_update b/board/a9m2440/env/bin/_update
index fb7cbe8619..e76eac9bc7 100644
--- a/board/a9m2440/env/bin/_update
+++ b/board/a9m2440/env/bin/_update
@@ -24,8 +24,6 @@ if [ $? -ne 0 ] ; then
exit 1
fi
-unprotect $part
-
echo
echo "erasing partition $part"
erase $part
diff --git a/board/a9m2440/env/bin/boot b/board/a9m2440/env/bin/boot
index e1673a1da1..86e22cf9ff 100644
--- a/board/a9m2440/env/bin/boot
+++ b/board/a9m2440/env/bin/boot
@@ -12,16 +12,16 @@ if [ x$1 = xnet ]; then
kernel=net
fi
-if [ x$ip = xdhcp ]; then
- bootargs="$bootargs ip=dhcp"
-else
- bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
-fi
-
if [ x$root = xnand ]; then
bootargs="$bootargs root=$rootpart_nand rootfstype=jffs2"
-else
+fi
+if [ x$root = xnet ]; then
bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp"
+ if [ x$ip = xdhcp ]; then
+ bootargs="$bootargs ip=dhcp"
+ else
+ bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
+ fi
fi
bootargs="$bootargs mtdparts=\"NAND 32MiB 3,3V 8-bit:$nand_parts\""
diff --git a/board/a9m2440/env/bin/update_root b/board/a9m2440/env/bin/update_root
index 34139e5dce..46cbca5beb 100644
--- a/board/a9m2440/env/bin/update_root
+++ b/board/a9m2440/env/bin/update_root
@@ -2,6 +2,8 @@
. /env/config
+part=/dev/nand0.root.bb
+
if [ x$1 = x ]; then
image=$jffs2
else