--- elwix/config/etc/uboot/rc.cfg	2014/01/27 21:27:02	1.1.2.4
+++ elwix/config/etc/uboot/rc.cfg	2014/01/27 23:51:01	1.1.2.8
@@ -2,17 +2,23 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.1.2.4 2014/01/27 21:27:02 misho Exp $
+# $Id: rc.cfg,v 1.1.2.8 2014/01/27 23:51:01 misho Exp $
 
-CFG_NAND_LIST="/etc/rc.s/cfg.map"
+CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/map/cfg"
 CFG_NAND_SIZE=65536
 
+FRM_NAND_MAP="/dev/map/firmware"
+FRM_NAND_CNT=121
+
+UPGRADE_IMAGE=""
+
 cd ${2:-.}
 
 case "$1" in
 	load)
-		dd if=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} | gunzip | cpio -ivud || exit 1
+		dd if=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} 2>&- | \
+		      gunzip 2>&- | cpio -iud 2>&- || exit 1
 		;;
 	save)
 		if [ ! -r ${CFG_NAND_LIST} ];then
@@ -24,12 +30,40 @@ case "$1" in
 			fi
 		fi
 
-		sed -nE -e 's/^ *([^ #]+) */\1/p' < ${CFG_NAND_LIST} | \
-			cpio -ov | gzip -9 | \
-			dd of=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} count=1 conv=sync || exit 1
+		sed -nE -e 's/^ *([^ #]+) */\1/p' < ${CFG_NAND_LIST} | xargs find | \
+			cpio -o | gzip -9 | \
+			dd of=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} count=1 conv=sync \
+				2>&- || exit 1
 		;;
+	erase)
+		dd if=/dev/zero of=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} count=1 \
+			conv=sync 2>&- || exit 1
+                echo "Config NAND was erased!"
+		;;
+	upgrade)
+		[ -r /tmp/upgrade.LCK ] && exit 1
+		ELWIX_UPGRADE_HOST=`cat /etc/myelwix`
+		ping -c1 "${ELWIX_UPGRADE_HOST}" >/dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			echo "ELWIX upgrade from host ${ELWIX_UPGRADE_HOST} failed!!!"
+			exit 1
+		fi
+
+		echo "ELIWX starting upgrade from ${ELWIX_UPGRADE_HOST}"
+		cat >/tmp/upgrade.LCK << _EOF
+binary
+get elwix_firmware.img /dev/fd/1
+_EOF
+		tftp ${ELWIX_UPGRADE_HOST} < /tmp/upgrade.LCK | dd \
+			of=${FRM_NAND_MAP} bs=${CFG_NAND_SIZE} \
+			count=${FRM_NAND_CNT} conv=sync 2>&- || exit 1
+		rm -f /tmp/upgrade.LCK
+		echo "ELWIX upgrade complete. Now rebooting system ..."
+		sleep 3
+		reboot
+		;;
 	*)
-		echo "Missing parameter - available options are (load | save)"
+		echo "Missing parameter - available options are (load | save | erase | upgrade)"
 		;;
 esac