mynewt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject incubator-mynewt-larva git commit: Don't invoke bin2img from download scripts.
Date Thu, 03 Mar 2016 01:21:47 GMT
Repository: incubator-mynewt-larva
Updated Branches:
  refs/heads/develop cdf3a7777 -> ae87902d5


Don't invoke bin2img from download scripts.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/ae87902d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/ae87902d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/ae87902d

Branch: refs/heads/develop
Commit: ae87902d5d8f34b8752b2fa5d8fe913f5e563a27
Parents: cdf3a77
Author: Marko Kiiskila <marko@runtime.io>
Authored: Wed Mar 2 17:20:49 2016 -0800
Committer: Marko Kiiskila <marko@runtime.io>
Committed: Wed Mar 2 17:20:49 2016 -0800

----------------------------------------------------------------------
 hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh      | 11 -----------
 hw/bsp/nrf51dk/nrf51dk_download.sh                      | 11 -----------
 .../olimex_stm32-e407_devboard_download.sh              | 12 ------------
 3 files changed, 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/ae87902d/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh b/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh
index 9f57060..4d8691e 100755
--- a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh
+++ b/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh
@@ -30,8 +30,6 @@ fi
 
 IS_BOOTLOADER=0
 BASENAME=$1
-BIN2IMG=project/bin2img/bin/bin2img/bin2img.elf
-VER=11.22.33.0
 #JLINK_SCRIPT=.download.jlink
 GDB_CMD_FILE=.gdb_cmds
 
@@ -49,16 +47,7 @@ if [ $IS_BOOTLOADER -eq 1 ]; then
     FILE_NAME=$BASENAME.elf.bin
 else
     FLASH_OFFSET=0x7000
-    ELF_FILE=$BASENAME.elf
-    BIN_FILE=$BASENAME.elf.bin
     FILE_NAME=$BASENAME.img
-    if [ \! -f $FILE_NAME -o $FILE_NAME -ot $ELF_FILE ]; then
-        echo "Version is >" $VER "<"
-        $BIN2IMG $BASENAME.elf.bin $FILE_NAME $VER
-        if [ "$?" -ne 0 ]; then
-	    exit 1
-	fi
-    fi
 fi
 
 echo "Downloading" $FILE_NAME "to" $FLASH_OFFSET

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/ae87902d/hw/bsp/nrf51dk/nrf51dk_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/nrf51dk_download.sh b/hw/bsp/nrf51dk/nrf51dk_download.sh
index 78b7b29..4d8691e 100755
--- a/hw/bsp/nrf51dk/nrf51dk_download.sh
+++ b/hw/bsp/nrf51dk/nrf51dk_download.sh
@@ -30,8 +30,6 @@ fi
 
 IS_BOOTLOADER=0
 BASENAME=$1
-BIN2IMG=project/bin2img/bin/bin2img/bin2img.elf
-VER=11.22.33.0
 #JLINK_SCRIPT=.download.jlink
 GDB_CMD_FILE=.gdb_cmds
 
@@ -49,16 +47,7 @@ if [ $IS_BOOTLOADER -eq 1 ]; then
     FILE_NAME=$BASENAME.elf.bin
 else
     FLASH_OFFSET=0x7000
-    ELF_FILE=$BASENAME.elf
-    BIN_FILE=$BASENAME.elf.bin
     FILE_NAME=$BASENAME.img
-    if [ \! -f $FILE_NAME -o $FILE_NAME -ot $ELF_FILE ]; then
-        echo "Version is >" $VER "<"
-        $BIN2IMG $BIN_FILE $FILE_NAME $VER
-        if [ "$?" -ne 0 ]; then
-             exit 1
-        fi
-    fi
 fi
 
 echo "Downloading" $FILE_NAME "to" $FLASH_OFFSET

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/ae87902d/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
----------------------------------------------------------------------
diff --git a/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh b/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
index 79e2439..3467e64 100755
--- a/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
+++ b/hw/bsp/olimex_stm32-e407_devboard/olimex_stm32-e407_devboard_download.sh
@@ -30,8 +30,6 @@ fi
 
 BASENAME=$1
 IS_BOOTLOADER=0
-BIN2IMG=project/bin2img/bin/bin2img/bin2img.elf
-VER=11.22.33.44
 
 # Look for 'bootloader' from 2nd arg onwards
 shift
@@ -47,17 +45,7 @@ if [ $IS_BOOTLOADER -eq 1 ]; then
     FILE_NAME=$BASENAME.elf.bin
 else
     FLASH_OFFSET=0x08020000
-    ELF_FILE=$BASENAME.elf
-    BIN_FILE=$BASENAME.elf.bin
     FILE_NAME=$BASENAME.img
-    # If there is no image file, or it is older than bin file, run bin2img.
-    if [ ! -f $FILE_NAME -o $FILE_NAME -ot $ELF_FILE ]; then
-        echo "Version is >" $VER "<"
-        $BIN2IMG $BIN_FILE $FILE_NAME $VER
-        if [ "$?" -ne 0 ]; then
-	    exit 1
-	fi
-    fi
 fi
 echo "Downloading" $FILE_NAME "to" $FLASH_OFFSET
 


Mime
View raw message