janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

mcu-flash.mk: Work around broken clean target

Browse source 
If MCU_BOARD_LC is empty, rm $(MCU_MEM|FLASH_FETCH_FILE_BIN) fails with unknown options.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-03 21:01:32 +00:00
commit f7b41f0652
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
make/mcu-flash.mk
View file

@ -6,27 +6,27 @@ flash-fetch: $(MCU_FLASH_FETCH_FILE_HEX)
flash-fetch-mem: $(MCU_MEM_FETCH_FILE_HEX) flash-fetch-mem: $(MCU_MEM_FETCH_FILE_HEX)
clean: flash-clean-fetch clean: flash-clean-fetch
flash-clean-fetch: flash-clean-fetch:
rm -f $(MCU_FLASH_FETCH_FILE_BIN) $(MCU_FLASH_FETCH_FILE_HEX) *.tmp $(RM) -f -- $(MCU_FLASH_FETCH_FILE_BIN) $(MCU_FLASH_FETCH_FILE_HEX) *.tmp
rm -f $(MCU_MEM_FETCH_FILE_BIN) $(MCU_MEM_FETCH_FILE_HEX) $(RM) -f -- $(MCU_MEM_FETCH_FILE_BIN) $(MCU_MEM_FETCH_FILE_HEX)
flash-clean-push: flash-clean-push:
rm -f $(MCU_FLASH_PUSH_FILE_BIN) $(MCU_FLASH_PUSH_FILE_HEX) *.tmp $(RM) -f -- $(MCU_FLASH_PUSH_FILE_BIN) $(MCU_FLASH_PUSH_FILE_HEX) *.tmp
rm -f $(MCU_MEM_PUSH_FILE_BIN) $(MCU_MEM_PUSH_FILE_HEX) $(RM) -f -- $(MCU_MEM_PUSH_FILE_BIN) $(MCU_MEM_PUSH_FILE_HEX)
flash-clean: flash-clean-fetch flash-clean-push flash-clean: flash-clean-fetch flash-clean-push
$(MCU_FLASH_FETCH_FILE_BIN): $(MCU_FLASH_FETCH_FILE_BIN):
$(TIME) $(MCU_OPENOCD) -c "init" -c "reset init" -c "flash read_bank $(MCU_FLASH_FETCH_BANK) $@.tmp $(MCU_FLASH_FETCH_OFFSET) $(MCU_FLASH_FETCH_SIZE)" -c "exit" $(TIME) $(MCU_OPENOCD) -c "init" -c "reset init" -c "flash read_bank $(MCU_FLASH_FETCH_BANK) $@.tmp $(MCU_FLASH_FETCH_OFFSET) $(MCU_FLASH_FETCH_SIZE)" -c "exit"
mv $@.tmp $@ $(MV) $@.tmp $@
$(MCU_MEM_FETCH_FILE_BIN): $(MCU_MEM_FETCH_FILE_BIN):
$(MCU_OPENOCD) -c "init" -c "reset init" -c "dump_image $@.tmp $(MCU_MEM_FETCH_OFFSET) $(MCU_MEM_FETCH_SIZE)" -c "exit" $(MCU_OPENOCD) -c "init" -c "reset init" -c "dump_image $@.tmp $(MCU_MEM_FETCH_OFFSET) $(MCU_MEM_FETCH_SIZE)" -c "exit"
mv $@.tmp $@ $(MV) $@.tmp $@
%.hex: %.elf %.hex: %.elf
$(OBJCOPY) -O ihex $< $@.tmp $(OBJCOPY) -O ihex $< $@.tmp
mv $@.tmp $@ $(MV) $@.tmp $@
clean: flash-clean-hex clean: flash-clean-hex
flash-clean-hex: flash-clean-hex:
rm -rf $(MCU_FLASH_PUSH_FILE_HEX) $(RM) -rf $(MCU_FLASH_PUSH_FILE_HEX)
%.hex: %.bin %.hex: %.bin
$(OBJCOPY) $(MCU_OBJCOPY_FETCH_OPTS) -I binary -O ihex $< $@.tmp $(OBJCOPY) $(MCU_OBJCOPY_FETCH_OPTS) -I binary -O ihex $< $@.tmp
mv $@.tmp $@ $(MV) $@.tmp $@
flash-push: $(MCU_FLASH_PUSH_FILE_HEX) flash-push: $(MCU_FLASH_PUSH_FILE_HEX)
# see http://openocd.org/doc/html/Flash-Programming.html # see http://openocd.org/doc/html/Flash-Programming.html
$(TIME) $(MCU_OPENOCD) -c "program $< verify reset exit $(MCU_FLASH_PUSH_OFFSET)" $(TIME) $(MCU_OPENOCD) -c "program $< verify reset exit $(MCU_FLASH_PUSH_OFFSET)"