mcu-defs.mk, mcu-flash.mk: Ongoing improvements

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-12 11:38:19 +00:00
commit 4216943215
2 changed files with 5 additions and 7 deletions

View file

@ -9,15 +9,15 @@
include $(MODDIR)/make/mcu-tags.mk
ifeq ($(MCU_BOARD_MODEL),)
error MCU_BOARD_MODEL not specified
$(error MCU_BOARD_MODEL not specified)
endif
ifeq ($(MCU_FLASH_OFFSET),)
error MCU_FLASH_OFFSET not specified
$(error MCU_FLASH_OFFSET not specified)
endif
ifeq ($(MCU_FLASH_SIZE),)
error MCU_FLASH_SIZE not specified
$(error MCU_FLASH_SIZE not specified)
endif
MCU_PRODUCT_TMPL_DIR ?= $(MODDIR)/tmpl/products
@ -43,8 +43,6 @@ MCU_FLASH_PUSH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX)
MCU_FLASH_PUSH_OFFSET ?= $(MCU_FLASH_OFFSET)
MCU_FLASH_PUSH_SIZE ?= $(MCU_FLASH_SIZE)
TOOLCHAIN_PREFIX ?= arm-none-eabi-
MCU_OBJCOPY ?= $(TOOLCHAIN_PREFIX)objcopy
MCU_FLASH_BANK ?= 0
MCU_FLASH_FILE_BIN ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).bin
MCU_FLASH_FILE_HEX ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).hex

View file

@ -12,13 +12,13 @@ $(MCU_FLASH_FETCH_FILE_BIN):
$(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 $@
%.hex: %.elf
$(MCU_OBJCOPY) -O ihex $< $@.tmp
$(OBJCOPY) -O ihex $< $@.tmp
mv $@.tmp $@
clean: flash-clean-hex
flash-clean-hex:
rm -rf $(MCU_FLASH_PUSH_FILE_HEX)
%.hex: %.bin
$(MCU_OBJCOPY) $(MCU_OBJCOPY_FETCH_OPTS) -I binary -O ihex $< $@.tmp
$(OBJCOPY) $(MCU_OBJCOPY_FETCH_OPTS) -I binary -O ihex $< $@.tmp
mv $@.tmp $@
flash-push:
# see http://openocd.org/doc/html/Flash-Programming.html