--- elwix/config/etc/uboot/rc.cfg	2014/02/04 10:14:42	1.1.2.10
+++ elwix/config/etc/uboot/rc.cfg	2014/02/06 01:00:41	1.1.2.17
@@ -2,22 +2,20 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.1.2.10 2014/02/04 10:14:42 misho Exp $
+# $Id: rc.cfg,v 1.1.2.17 2014/02/06 01:00:41 misho Exp $
 
 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
+FRM_NAND_SIZE=7929856
 
-UPGRADE_IMAGE=""
-
 cd ${2:-/etc}
 
 case "$1" in
 	load)
-		dd if=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} 2>&- | \
+		imgupd -gs ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} | \
 		      gunzip 2>&- | cpio -iud 2>&- || exit 1
 		;;
 	save)
@@ -32,32 +30,27 @@ case "$1" in
 
 		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
+			imgupd -is ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} || exit 1
 		;;
 	erase)
-		dd if=/dev/zero of=${CFG_NAND_MAP} bs=${CFG_NAND_SIZE} count=1 \
-			conv=sync 2>&- || exit 1
+		imgupd -is ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} /dev/zero || 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
+		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="https://${ELWIX_UPGRADE_HOST}/elwix/upgrade/elwix_firmware.bin"
+			ELWIX_UPGRADE_HOST="${ELWIX_UPGRADE_HOST}/elwix/elwix_firmware.bin"
 		fi
 
 		echo "ELIWX starting upgrade from ${ELWIX_UPGRADE_HOST}"
-		fetch -o- ${ELWIX_UPGRADE_HOST} | dd \
-			of=${FRM_NAND_MAP} bs=${CFG_NAND_SIZE} \
-			count=${FRM_NAND_CNT} conv=sync 2>&- || exit 1
+		fetch -q -o- --user-agent=ELWIX_Upgrade --allow-sslv2 \
+			--no-verify-peer --no-verify-hostname ${ELWIX_UPGRADE_HOST} | \
+			imgupd -R -is ${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 | erase | upgrade)"