[ipe337] new version of update_* scripts

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

5 files changed, 41 insertions, 46 deletions

diff --git a/board/ipe337/env/bin/_update b/board/ipe337/env/bin/_update
new file mode 100644
index 0000000000..b21d17378a
--- /dev/null
+++ b/board/ipe337/env/bin/_update
@@ -0,0 +1,23 @@
+echo "updating $image to $part"
+
+if [ -z "$part" -o -z "$image" ]; then
+	echo "define \$part and \$image"
+	exit 1
+fi
+
+if [ \! -e "$part" ]; then
+        echo "Partition $part does not exist"
+        exit 1
+fi
+
+if [ $# = 1 ]; then
+        image=$1
+fi
+
+if [ x$ip = xdhcp ]; then
+        dhcp
+fi
+
+unprotect $part
+erase $part
+tftp $image $part
diff --git a/board/ipe337/env/bin/boot b/board/ipe337/env/bin/boot
index b10ab73d64..ee10b46f3e 100644
--- a/board/ipe337/env/bin/boot
+++ b/board/ipe337/env/bin/boot
@@ -1,4 +1,3 @@
-
 . /env/config
 
 if [ x$1 = "xflash" ]; then 
@@ -17,7 +16,7 @@ else
 	if [ "$ip" = dhcp ]; then
 		bootargs="$bootargs ip=dhcp"
 	else
-		bootargs="$bootargs ip=$eth0.ip:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
+		bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
 	fi
 	bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp"
 fi
diff --git a/board/ipe337/env/bin/update_kernel b/board/ipe337/env/bin/update_kernel
index a9ce158f9c..b62caea72e 100644
--- a/board/ipe337/env/bin/update_kernel
+++ b/board/ipe337/env/bin/update_kernel
@@ -1,20 +1,6 @@
 . /env/config
 
-if [ -z /dev/nor0.kernel ]; then
-        echo "Please add a partition /dev/nor0.kernel containing the kernel image"
-        exit 1
-fi
+image=$uimage
+part=/dev/nor0.kernel
 
-image=uImage-ipe337
-
-if [ $# = 1 ]; then
-        image=$1
-fi
-
-if [ x$ip = xdhcp ]; then
-        dhcp
-fi
-
-unprotect /dev/nor0.kernel
-erase /dev/nor0.kernel
-tftp "$image" /dev/nor0.kernel
+. /env/bin/_update $1
diff --git a/board/ipe337/env/bin/update_root b/board/ipe337/env/bin/update_root
index 7d0a21dea1..4d0c9b6802 100644
--- a/board/ipe337/env/bin/update_root
+++ b/board/ipe337/env/bin/update_root
@@ -1,20 +1,6 @@
 . /env/config
 
-if [ -z $rootdev ]; then
-        echo "$rootdev not set. Please set to your device containing the root image"
-        exit 1
-fi
+image=$jffs2
+part=/dev/nor0.root
 
-image=root-ipe337.jffs2
-
-if [ $# = 1 ]; then
-        image=$1
-fi
-
-if [ x$ip = xdhcp ]; then
-        dhcp
-fi
-
-unprotect "$rootdev"
-erase "$rootdev"
-tftp $image "$rootdev"
+. /env/bin/_update $1
diff --git a/board/ipe337/env/config b/board/ipe337/env/config
index cf0fcb1ad7..c15fba89b4 100644
--- a/board/ipe337/env/config
+++ b/board/ipe337/env/config
@@ -1,21 +1,22 @@
 echo /env/config
 
-eth0.serverip=192.168.23.2
-eth0.ethaddr=80:87:78:74:73:63
-
-mtdparts="128k(uboot)ro,128k(ubootenv),128k(alternate),1536k(kernel),-(root)"
-
 ip=dhcp
-eth0.ip=192.168.25.2
+
+eth0.ipaddr=192.168.23.164
+eth0.ethaddr=80:87:78:74:73:63
+eth0.serverip=192.168.23.1
 eth0.netmask=255.255.255.0
-eth0.gateway=192.168.25.1
+eth0.gateway=192.168.23.1
 
-nfsroot="/home/sha/octopus/blackfin/OSELAS.BSP-Pipetronix-ipe337-trunk/root"
 uimage=uImage-bfin
 jffs2=root-bfin.jffs2
 
+nfsroot="/home/kleineb/pengutronix/pii-bf/OSELAS.BSP-Pipetronix-ipe337-trunk/root"
 bootargs="console=ttyBF0,115200"
 
 # can be either 'net' or 'flash'
-kernel=flash
-root=flash
+kernel=net
+root=net
+
+mtdparts="128k(uboot)ro,128k(ubootenv),128k(alternate),1536k(kernel),-(root)"
+addpart /dev/nor0 $mtdparts