--- elwix/config/etc/uboot/rc.cfg	2014/01/24 12:07:01	1.1.2.2
+++ elwix/config/etc/uboot/rc.cfg	2014/02/05 22:07:14	1.1.2.15
@@ -2,27 +2,61 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.1.2.2 2014/01/24 12:07:01 misho Exp $
+# $Id: rc.cfg,v 1.1.2.15 2014/02/05 22:07:14 misho Exp $
 
 CFG_NAND_LIST="/etc/cfg.map"
 CFG_NAND_MAP="/dev/map/cfg"
 CFG_NAND_SIZE=65536
 
-if [ ! -r ${CFG_NAND_LIST} ];then
-	echo "Manifest cfg nand map - file '${CFG_NAND_LIST}' not found!"
-	exit 1
-fi
+FRM_NAND_MAP="/dev/map/firmware"
+FRM_NAND_SIZE=7929856
 
+cd ${2:-/etc}
+
 case "$1" in
 	load)
-		dd if=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} | gunzip | cpio -ivud
+		imgupd -gs ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} | \
+		      gunzip 2>&- | cpio -iud 2>&- || exit 1
 		;;
 	save)
-		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
+		if [ ! -r ${CFG_NAND_LIST} ];then
+			echo "# Auto generated manifest file" >${CFG_NAND_LIST}
+			find . >>${CFG_NAND_LIST}
+			if [ $? -ne 0 -o ! -r ${CFG_NAND_LIST} ]; then
+				echo "Manifest cfg nand map - file '${CFG_NAND_LIST}' not found!"
+				exit 1
+			fi
+		fi
+
+		sed -nE -e 's/^ *([^ #]+) */\1/p' < ${CFG_NAND_LIST} | xargs find | \
+			cpio -o | gzip -9 | \
+			imgupd -ts ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} || exit 1
 		;;
+	erase)
+		imgupd -ts ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} /dev/zero || exit 1
+                echo "Config NAND was erased!"
+		;;
+	upgrade)
+		ELWIX_UPGRADE_HOST=`cat /etc/myelwix`
+		ping -c1 $(echo ${ELWIX_UPGRADE_HOST} | cut -f3 -d '/' | cut -f2 -d '@') >/dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			echo "ELWIX upgrade from host ${ELWIX_UPGRADE_HOST} failed!!!"
+			exit 1
+		else
+			ELWIX_UPGRADE_HOST="${ELWIX_UPGRADE_HOST}/elwix/elwix_firmware.bin"
+		fi
+
+		echo "ELIWX starting upgrade from ${ELWIX_UPGRADE_HOST}"
+		fetch -q -o- --user-agent=ELWIX_Upgrade --allow-sslv2 \
+			--no-verify-peer --no-verify-hostname ${ELWIX_UPGRADE_HOST} | \
+			imgupd -ts ${FRM_NAND_SIZE} -f ${FRM_NAND_MAP} || exit 1
+		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
+
+cd -