--- elwix/config/etc/uboot/rc.cfg	2014/01/27 23:51:01	1.1.2.8
+++ elwix/config/etc/uboot/rc.cfg	2014/02/05 16:14:07	1.1.2.14
@@ -2,18 +2,18 @@
 #
 # U-boot cfg nand map load/save management script
 #
-# $Id: rc.cfg,v 1.1.2.8 2014/01/27 23:51:01 misho Exp $
+# $Id: rc.cfg,v 1.1.2.14 2014/02/05 16:14:07 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:-.}
+cd ${2:-/etc}
 
 case "$1" in
 	load)
@@ -32,32 +32,26 @@ 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 -ts ${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 -ts ${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="${ELWIX_UPGRADE_HOST}/elwix/elwix_firmware.bin"
 		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
+		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