From 78daad4b3e229bc30e5504b3db6d9221171a5cab Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 14 Oct 2018 10:03:52 -0400 Subject: [PATCH] adjusting scripts --- ...sh_erase_new_board.bat => flash_erase.bat} | 0 firmware/flash_erase_old_board.bat | 21 ------------------- firmware/flash_openocd.bat | 3 +-- misc/build_current_bundle.bat | 6 +++--- ..._openocd_old_board.bat => run_openocd.bat} | 0 misc/install/run_openocd_new_board.bat | 5 ----- 6 files changed, 4 insertions(+), 31 deletions(-) rename firmware/{flash_erase_new_board.bat => flash_erase.bat} (100%) delete mode 100644 firmware/flash_erase_old_board.bat rename misc/install/{run_openocd_old_board.bat => run_openocd.bat} (100%) delete mode 100644 misc/install/run_openocd_new_board.bat diff --git a/firmware/flash_erase_new_board.bat b/firmware/flash_erase.bat similarity index 100% rename from firmware/flash_erase_new_board.bat rename to firmware/flash_erase.bat diff --git a/firmware/flash_erase_old_board.bat b/firmware/flash_erase_old_board.bat deleted file mode 100644 index 79a57ce434..0000000000 --- a/firmware/flash_erase_old_board.bat +++ /dev/null @@ -1,21 +0,0 @@ -rem st-link_cli -c SWD ur -ME -rem 0x100000 would erase both code and configuration -rem use 0x080000 if you want to erase only configuratio -echo I am flash_erase.bat - -rem weird, it used to be much nicer with openocd 0.8.0, file location was not broken? -rem maybe https://sourceforge.net/p/openocd/tickets/105/ ? - -pwd -cp -r ../misc/install/openocd . -ls -l - -if not exist openocd/openocd.exe echo openocd/openocd.exe NOT FOUND -if not exist openocd/openocd.exe exit -1 - - -rem newer discovery boards -rem openocd\openocd.exe -f openocd/stm32f429disc1.cfg -c init -c targets -c "halt" -c "flash erase_address 0x08000000 0x0100000" -c shutdown - -rem older disocovery boards or cheap eBay ST-Link -openocd\openocd.exe -f openocd/stm32f4discovery.cfg -c init -c targets -c "halt" -c "flash erase_address 0x08000000 0x0100000" -c shutdown \ No newline at end of file diff --git a/firmware/flash_openocd.bat b/firmware/flash_openocd.bat index fca0a64a51..426cc97b0c 100644 --- a/firmware/flash_openocd.bat +++ b/firmware/flash_openocd.bat @@ -5,6 +5,5 @@ cp -r ../misc/install/openocd . if not exist openocd/openocd.exe echo openocd/openocd.exe NOT FOUND if not exist openocd/openocd.exe exit -1 -openocd\openocd -f openocd/stm32f429disc1.cfg -c "program build/rusefi.bin verify reset exit 0x08000000" +openocd\openocd -f openocd/stm32f4discovery.cfg -c "program build/rusefi.bin verify reset exit 0x08000000" -rem openocd-0.8.0.exe -f interface/stlink-v2.cfg -f board/stm32f4discovery.cfg -c "program rusefi.bin verify reset exit 0x08000000" diff --git a/misc/build_current_bundle.bat b/misc/build_current_bundle.bat index f44dacb2a1..d8e9988f52 100644 --- a/misc/build_current_bundle.bat +++ b/misc/build_current_bundle.bat @@ -24,9 +24,9 @@ echo %date% %time% echo Erasing chip -if not exist flash_erase_new_board.bat echo NOT FOUND flash_erase_new_board.bat -if not exist flash_erase_new_board.bat exit -1 -call flash_erase_new_board.bat +if not exist flash_erase.bat echo NOT FOUND flash_erase.bat +if not exist flash_erase.bat exit -1 +call flash_erase.bat echo build_current_bundle.bat: Building firmware diff --git a/misc/install/run_openocd_old_board.bat b/misc/install/run_openocd.bat similarity index 100% rename from misc/install/run_openocd_old_board.bat rename to misc/install/run_openocd.bat diff --git a/misc/install/run_openocd_new_board.bat b/misc/install/run_openocd_new_board.bat deleted file mode 100644 index 10e4c6ad03..0000000000 --- a/misc/install/run_openocd_new_board.bat +++ /dev/null @@ -1,5 +0,0 @@ -rem if you have an older Rev C discovery please update to latest Rev D firmware - -rem As of March 2017 this enabled GDB debugging using ARM Eclipse plug-in - -openocd\openocd.exe -f openocd/stm32f429disc1.cfg -c init -c reset