diff options
| -rw-r--r-- | packages/zaurus-updater/zaurus-updater.bb | 2 | ||||
| -rw-r--r-- | packages/zaurus-updater/zaurus-updater/updater.sh | 35 |
2 files changed, 3 insertions, 34 deletions
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index ec8f16c9bf..35ad16064c 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r9" +PR = "r11" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh index d6e5b7fc15..703a1fb457 100644 --- a/packages/zaurus-updater/zaurus-updater/updater.sh +++ b/packages/zaurus-updater/zaurus-updater/updater.sh @@ -21,12 +21,6 @@ # - c760/c860 has bigger rootfs - use it # -date_log() -{ - echo "$LOG: `date`" -} -LOG="updater start"; date_log - DATAPATH=$1 TMPPATH=/tmp/update TMPDATA=$TMPPATH/tmpdata.bin @@ -41,10 +35,8 @@ if [ "$RO_MTD_LINE" = "" ]; then RO_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1` fi RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -f1 | cut -dd -f2` -RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2` RO_MTD=/dev/mtd$RO_MTD_NO - -echo "RO_MTD = $RO_MTD" +ROOTFS_SIZE=`echo $RO_MTD_LINE | cut -d" " -f2` LOGOCAL_MTD=/dev/mtd1 @@ -167,9 +159,7 @@ do_flashing() if [ $ISFORMATTED = 0 ] then - LOG="flash erasing ($TARGET_MTD) start"; date_log /sbin/eraseall $TARGET_MTD > /dev/null 2>&1 - LOG="flash erasing ($TARGET_MTD) end"; date_log ISFORMATTED=1 fi @@ -184,7 +174,6 @@ do_flashing() if [ -e $TMPHEAD ] then - LOG="nandlogical read start"; date_log VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp' MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp' /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 @@ -192,7 +181,6 @@ do_flashing() /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 - LOG="nandlogical read end"; date_log fi #loop @@ -240,16 +228,12 @@ do_flashing() then if [ -e $VTMPNAME ] then - LOG="nandlogical write2 start"; date_log /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - LOG="nandlogical write2 end"; date_log rm -f $VTMPNAME > /dev/null 2>&1 fi if [ -e $MTMPNAME ] then - LOG="nandlogical write3 start"; date_log /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - LOG="nandlogical write3 end"; date_log rm -f $MTMPNAME > /dev/null 2>&1 fi echo 'Done.' @@ -264,27 +248,18 @@ MODEL=`cat /proc/deviceinfo/product` case "$MODEL" in SL-B500|SL-5600) ZAURUS='poodle' - ROOTFS_SIZE=0x1600000 ;; SL-6000) ZAURUS='tosa' - ROOTFS_SIZE=0x1E00000 ;; SL-C1000) ZAURUS='akita' - ROOTFS_SIZE=0x1900000 ;; - SL-C700|SL-C750|SL-7500) + SL-C700|SL-C750|SL-7500|SL-C760|SL-C860) ZAURUS='c7x0' - ROOTFS_SIZE=0x1900000 - ;; - SL-C760|SL-C860) - ZAURUS='c7x0' - ROOTFS_SIZE=0x3500000 ;; SL-C3000|SL-C3100|SL-C3200) ZAURUS='c3x00' - ROOTFS_SIZE=0x0500000 check_for_hdd check_for_tar ;; @@ -302,8 +277,6 @@ echo 'MODEL: '$MODEL' ('$ZAURUS')' mkdir -p $TMPPATH > /dev/null 2>&1 -LOG="updater after model"; date_log - cd $DATAPATH/ for TARGETFILE in zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ @@ -338,11 +311,9 @@ do HDTOP=`expr $DATASIZE - 16` /sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE echo "HDTOP=$HDTOP" - LOG="updater flashing kernel start"; date_log FLASH_TYPE="kernel" do_flashing FLASH_TYPE="" - LOG="updater flashing kernel end"; date_log ;; initrd.bin) @@ -361,11 +332,9 @@ do DATAPOS=16 ONESIZE=1048576 /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE - LOG="updater flashing rootfs start"; date_log FLASH_TYPE="rootfs" do_flashing FLASH_TYPE="" - LOG="updater flashing rootfs end"; date_log ;; hdimage1.tgz) |