[aadk-commits] qwell: branch uClinux/upstreamsync r320 - in /uClinux/branches/upstreamsync: ...

[aadk-commits at lists.digium.com]

Author: qwell
Date: Wed Apr  4 12:38:51 2007
New Revision: 320

URL: http://svn.digium.com/view/aadk?view=rev&rev=320
Log:
Pull in bootloaderupdate script fixes from trunk.

Modified:
    uClinux/branches/upstreamsync/   (props changed)
    uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/bootloaderupdate

Propchange: uClinux/branches/upstreamsync/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr  4 12:38:51 2007
@@ -1,1 +1,1 @@
-/uClinux/trunk:1-314
+/uClinux/trunk:1-314,319

Modified: uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/bootloaderupdate
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/bootloaderupdate?view=diff&rev=320&r1=319&r2=320
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/bootloaderupdate (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/bootloaderupdate Wed Apr  4 12:38:51 2007
@@ -1,6 +1,6 @@
 #!/bin/sh
 PID=$$
-# Script for reflashing uCLinux image to SPI FLASH 
+# Script for reflashing u-boot image to SPI FLASH 
 if [ "$1" = "" ]; then
 	echo "Usage: bootloaderupdate <imageURL>"
 	echo "       OR bootloaderupdate tftp <hostname> [<filename>]"
@@ -11,7 +11,7 @@
 if [ "$1" = "tftp" ]; then
 	HOST=$2
 	if [ "$3" = "" ]; then
-			FILENAME=uImage
+			FILENAME=app.ldr
 	else
 			FILENAME=$3
 	fi
@@ -34,9 +34,9 @@
 fi
 
 FILESIZE=`ls -l /tmp/image-${PID}.bin | cut -c 30-42 | xargs basename`
-echo "Downloaded bootloadere /tmp/image-${PID} is size ${FILESIZE}"
+echo "Downloaded bootloader /tmp/image-${PID} is size ${FILESIZE}"
 
-echo "Save Previous Environment"
+echo "Saving Previous Environment"
 nvram dump /tmp/env-${PID}.txt
 echo "Writing bootloader to FLASH...  DO NOT REBOOT!!!"
 dd bs=65536 if=/tmp/image-${PID}.bin of=/dev/mtd1 conv=sync 2>/dev/null