diff --git a/.gitignore b/.gitignore index 8644c81..52d428b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ Bootloader.sublime-workspace .vscode build tmp +Makefile.user diff --git a/Makefile b/Makefile index 2db6415..466f872 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,8 @@ FLAGS += -mthumb $(CPUFLAGS) \ $(EXTRAFLAGS) +OPENOCDALL = $(OPENOCD) -f $(JTAGCONFIG) -f target/stm32$(FN)x.cfg + # # Bootloaders to build # @@ -92,14 +94,18 @@ build-bl: $(MAKEFILE_LIST) $(OCM3FILE) do-build # include rules.mk +flash: upload +burn: upload +b: burn +f: flash + upload: build flash-bootloader flash-bootloader: - $(OPENOCD) -f $(JTAGCONFIG) -f ocd/stm32$(FN)x.cfg \ - -c "program build/$(BOARD)/bootloader.elf verify reset exit " + $(OPENOCDALL) -c "program build/$(BOARD)/bootloader.elf verify reset exit " gdb: - arm-none-eabi-gdb --eval "target remote | $(OPENOCD) -f $(JTAGCONFIG) -f ocd/stm32$(FN)x.cfg -f ocd/debug.cfg" build/$(BOARD)/bootloader.elf + arm-none-eabi-gdb --eval "target remote | $(OPENOCDALL) -f ocd/debug.cfg" build/$(BOARD)/bootloader.elf # # Show sizes @@ -108,6 +114,9 @@ gdb: sizes: @-find build/*/ -name '*.elf' -type f | xargs size 2> /dev/null || : +drop: + for f in `cd boards; ls` ; do $(MAKE) BOARD=$$f ; done + cd build; 7z a uf2-stm32f.zip */bootloader.bin */flasher*uf2 # # Binary management # diff --git a/uf2cfg.h b/uf2cfg.h index b3e8786..70846db 100644 --- a/uf2cfg.h +++ b/uf2cfg.h @@ -1,4 +1,4 @@ -#define UF2_VERSION "2.3.1" +#define UF2_VERSION "2.3.2" #define BOARD_ID "STM32F401-BrainPad-Arcade-RevA" #define INDEX_URL "https://arcade.makecode.com" #define UF2_NUM_BLOCKS 8000