juribeparada/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/juribeparada/MMDVM_HS.git synced 2025-12-06 07:12:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into M17

Browse source
This commit is contained in:
Jonathan Naylor 2021-06-20 23:12:20 +01:00
parent df3a140173 436cebb7a4
commit 9498ef4e82
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Makefile
View file

@ -110,10 +110,20 @@ else
MDDIRS=mkdir $@ MDDIRS=mkdir $@
ifeq ($(shell uname -s),Linux) ifeq ($(shell uname -s),Linux)
ST_FLASH_ON_PATH=$(shell which st-flash)
ST_FLASH_IS_ON_PATH=$(.SHELLSTATUS)
ifeq ($(shell uname -m),x86_64) ifeq ($(shell uname -m),x86_64)
DFU_RST=./$(F1_LIB_PATH)/utils/linux64/upload-reset DFU_RST=./$(F1_LIB_PATH)/utils/linux64/upload-reset
DFU_UTIL=./$(F1_LIB_PATH)/utils/linux64/dfu-util DFU_UTIL=./$(F1_LIB_PATH)/utils/linux64/dfu-util
ST_FLASH=./$(F1_LIB_PATH)/utils/linux64/st-flash DFU_RST=./$(F1_LIB_PATH)/utils/linux64/upload-reset
DFU_UTIL=./$(F1_LIB_PATH)/utils/linux64/dfu-util
ifeq ($(ST_FLASH_IS_ON_PATH),0)
ST_FLASH=$(ST_FLASH_ON_PATH)
ST_FLASH_OPTS=--flash=128k
else
ST_FLASH=./$(F1_LIB_PATH)/utils/linux64/st-flash
ST_FLASH_OPTS=
endif
STM32FLASH=./$(F1_LIB_PATH)/utils/linux64/stm32flash STM32FLASH=./$(F1_LIB_PATH)/utils/linux64/stm32flash
else ifeq ($(shell uname -m),armv7l) else ifeq ($(shell uname -m),armv7l)
DFU_RST=./$(F1_LIB_PATH)/utils/rpi32/upload-reset DFU_RST=./$(F1_LIB_PATH)/utils/rpi32/upload-reset
@ -128,7 +138,13 @@ else
else else
DFU_RST=./$(F1_LIB_PATH)/utils/linux/upload-reset DFU_RST=./$(F1_LIB_PATH)/utils/linux/upload-reset
DFU_UTIL=./$(F1_LIB_PATH)/utils/linux/dfu-util DFU_UTIL=./$(F1_LIB_PATH)/utils/linux/dfu-util
ST_FLASH=./$(F1_LIB_PATH)/utils/linux/st-flash ifeq ($(ST_FLASH_IS_ON_PATH),0)
ST_FLASH=$(ST_FLASH_ON_PATH)
ST_FLASH_OPTS=--flash=128k
else
ST_FLASH=./$(F1_LIB_PATH)/utils/linux/st-flash
ST_FLASH_OPTS=
endif
STM32FLASH=./$(F1_LIB_PATH)/utils/linux/stm32flash STM32FLASH=./$(F1_LIB_PATH)/utils/linux/stm32flash
endif endif
endif endif
@ -405,20 +421,20 @@ clean:
$(RM) GitVersion.h $(RM) GitVersion.h
stlink: stlink:
$(ST_FLASH) write bin/$(BINBIN_F1) 0x8000000 $(ST_FLASH) $(ST_FLASH_OPTS) write bin/$(BINBIN_F1) 0x8000000
stlink-nobl: stlink-nobl:
$(ST_FLASH) write bin/$(BINBIN_F1NOBL) 0x8000000 $(ST_FLASH) $(ST_FLASH_OPTS) write bin/$(BINBIN_F1NOBL) 0x8000000
stlink-bl: stlink-bl:
$(ST_FLASH) write $(F1_LIB_PATH)/utils/bootloader/generic_boot20_pc13_long_rst.bin 0x8000000 $(ST_FLASH) $(ST_FLASH_OPTS) write $(F1_LIB_PATH)/utils/bootloader/generic_boot20_pc13_long_rst.bin 0x8000000
sleep 3 sleep 3
$(ST_FLASH) write bin/$(BINBIN_F1BL) 0x8002000 $(ST_FLASH) $(ST_FLASH_OPTS) write bin/$(BINBIN_F1BL) 0x8002000
stlink-bl-old: stlink-bl-old:
$(ST_FLASH) write $(F1_LIB_PATH)/utils/bootloader/generic_boot20_pc13.bin 0x8000000 $(ST_FLASH) $(ST_FLASH_OPTS) write $(F1_LIB_PATH)/utils/bootloader/generic_boot20_pc13.bin 0x8000000
sleep 3 sleep 3
$(ST_FLASH) write bin/$(BINBIN_F1BL) 0x8002000 $(ST_FLASH) $(ST_FLASH_OPTS) write bin/$(BINBIN_F1BL) 0x8002000
serial: serial:
$(STM32FLASH) -v -w bin/$(BINBIN_F1) -g 0x0 $(devser) $(STM32FLASH) -v -w bin/$(BINBIN_F1) -g 0x0 $(devser)