From 8b9557f7946703888be97633cf3e54216c652f30 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 24 Apr 2017 22:25:14 -0700 Subject: [PATCH] altos/ao-bringup: Switch turnon_easymini to v2.0 Not planning on buildin more v1.0 boards Signed-off-by: Keith Packard --- ao-bringup/test-easymini | 2 +- ao-bringup/turnon_easymini | 27 ++++++++++++--------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/ao-bringup/test-easymini b/ao-bringup/test-easymini index e9948da9..7850b550 100755 --- a/ao-bringup/test-easymini +++ b/ao-bringup/test-easymini @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.0 +VERSION=2.0 PRODUCT=EasyMini BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'` diff --git a/ao-bringup/turnon_easymini b/ao-bringup/turnon_easymini index 4580790a..9b66dc5e 100755 --- a/ao-bringup/turnon_easymini +++ b/ao-bringup/turnon_easymini @@ -1,12 +1,10 @@ #!/bin/sh -if [ -x ../ao-tools/ao-flash/ao-flash-lpc ]; then - FLASH_LPC=../ao-tools/ao-flash/ao-flash-lpc -elif [ -x /usr/bin/ao-flash-lpc ]; then - FLASH_LPC=/usr/bin/ao-flash-lpc +if [ -x /usr/bin/dfu-util ]; then + DFU_UTIL=/usr/bin/dfu-util else - echo "Can't find ao-flash-lpc! Aborting." - exit 1 + echo "Can't find dfu-util! Aborting." + exit 1 fi if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then @@ -18,17 +16,16 @@ else exit 1 fi -VERSION=1.0 +VERSION=2.0 PRODUCT=EasyMini BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'` echo $FILE echo "$PRODUCT v$VERSION Turn-On and Calibration Program" -echo "Copyright 2010 by Bdale Garbee. Released under GPL v2" +echo "Copyright 2010 by Bdale Garbee. Released under GPL v2+" echo echo "Expectations:" -echo "\t$PRODUCT v$VERSION powered from USB" -echo "\t\twith ST-Link-V2 cabled to debug header" +echo "\t$PRODUCT v$VERSION powered and connected to USB" echo case $# in @@ -49,17 +46,17 @@ esac # # Use released versions of everything # -FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v1.0-altos-flash-*.elf -ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v1.0-*.elf +FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v2.0-altos-flash-*.bin +ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v2.0-*.elf #FLASH_FILE=../src/$BASE-v$VERSION/flash-loader/$BASE-v$VERSION-altos-flash-*.elf #ALTOS_FILE=../src/$BASE-v$VERSION/*.ihx -echo $FLASH_LPC $FLASH_FILE +echo $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE -$FLASH_LPC $FLASH_FILE || exit 1 +#$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1 -sleep 1 +sleep 2 echo $USBLOAD $ALTOS_FILE -- 2.30.2