From 42169432150249510b17a22fca74deb1b220f3d4 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 12 Mar 2019 11:38:19 +0000 Subject: [PATCH] mcu-defs.mk, mcu-flash.mk: Ongoing improvements Signed-off-by: Jan Lindemann --- make/mcu-defs.mk | 8 +++----- make/mcu-flash.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/make/mcu-defs.mk b/make/mcu-defs.mk index 5ddb6fb1..3c11fbce 100644 --- a/make/mcu-defs.mk +++ b/make/mcu-defs.mk @@ -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 diff --git a/make/mcu-flash.mk b/make/mcu-flash.mk index 68981600..b5cb313d 100644 --- a/make/mcu-flash.mk +++ b/make/mcu-flash.mk @@ -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