janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 07:00:39 +01:00
Code Activity

make: Improve flash-fetch targets

Browse source 
- Add support MCU_FLASH_BANK_NAME to support multiple banks
- Prefix binaries with TARGET_PRODUCT, if defined
- Fix flash data for stm32f769i-disco

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-29 13:32:16 +00:00
commit 9c773838c7
7 changed files with 145 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

51
make/mcu-defs.mk
View file

@ -22,17 +22,33 @@
MCU_PRODUCT_TMPL_DIR ?= $(MODDIR)/tmpl/products
MCU_BOARD_MODEL_LC ?= $(shell echo $(MCU_BOARD_MODEL) | tr '[A-Z]' '[a-z]')
MCU_BOARD ?= $(MCU_BOARD_MODEL)
MCU_BOARD_LC ?= $(shell echo $(MCU_BOARD) | tr '[A-Z]' '[a-z]')
ifneq ($(TARGET_PRODUCT),)
MCU_BOARD_MODEL_LC ?= $(TARGET_PRODUCT)
MCU_BOARD ?= $(TARGET_PRODUCT)
MCU_BOARD_LC ?= $(TARGET_PRODUCT)
else
MCU_BOARD_MODEL_LC ?= $(shell echo $(MCU_BOARD_MODEL) | tr '[A-Z]' '[a-z]')
MCU_BOARD ?= $(MCU_BOARD_MODEL)
MCU_BOARD_LC ?= $(shell echo $(MCU_BOARD) | tr '[A-Z]' '[a-z]')
endif
MCU_OPENOCD_CFG_NAME ?= openocd-$(MCU_BOARD_LC).cfg
MCU_OPENOCD_CFG_DEFAULT_SEARCH_PATH ?= $(TOPDIR)/make
MCU_OPENOCD_CFG_SEARCH_PATH ?= $(MCU_OPENOCD_CFG_DEFAULT_SEARCH_PATH)
MCU_OPENOCD_CFG_FILE ?= $(call find_file,$(MCU_OPENOCD_CFG_NAME),$(MCU_OPENOCD_CFG_SEARCH_PATH))
MCU_OPENOCD_OPTS ?= -f $(MCU_OPENOCD_CFG_FILE) -c "echo \"Started by jw-build\"" -c "gdb_port 3333" -c "telnet_port 4444" -c "tcl_port 6666"
MCU_OPENOCD_CFG_FILE ?= $(info looking for $(MCU_OPENOCD_CFG_NAME) in $(MCU_OPENOCD_CFG_SEARCH_PATH)) $(call find_file,$(MCU_OPENOCD_CFG_NAME),$(MCU_OPENOCD_CFG_SEARCH_PATH))
MCU_OPENOCD_TELNET_PORT ?= 4444
MCU_OPENOCD_OPTS ?= -f $(MCU_OPENOCD_CFG_FILE) -c "echo \"Started by jw-build\"" -c "gdb_port 3333" -c "telnet_port $(MCU_OPENOCD_TELNET_PORT)" -c "tcl_port 6666"
MCU_OPENOCD_BIN ?= openocd
MCU_OPENOCD ?= $(MCU_OPENOCD_BIN) $(MCU_OPENOCD_OPTS)
MCU_OPENOCD ?= $(MCU_OPENOCD_BIN) $(MCU_OPENOCD_OPTS) $(MCU_OPENOCD_EXTRA_OPTS)
# -- direct flash access
MCU_FLASH_BANK ?= 0
#MCU_FLASH_OFFSET ?= 0x0000000
#MCU_FLASH_SIZE ?= 0x5000
MCU_FLASH_FILE_BASE ?= $(MCU_BOARD_LC)-flash-$(MCU_FLASH_BANK_NAME)
MCU_FLASH_FILE_BIN ?= $(MCU_FLASH_FILE_BASE).bin
MCU_FLASH_FILE_HEX ?= $(MCU_FLASH_FILE_BASE).hex
MCU_FLASH_FETCH_BANK ?= $(MCU_FLASH_BANK)
MCU_FLASH_FETCH_FILE_BIN ?= $(MCU_FLASH_FILE_BIN)
@ -46,12 +62,21 @@ MCU_FLASH_PUSH_FILE_HEX ?= $(MCU_FLASH_FILE_HEX)
MCU_FLASH_PUSH_OFFSET ?= $(MCU_FLASH_OFFSET)
MCU_FLASH_PUSH_SIZE ?= $(MCU_FLASH_SIZE)
MCU_FLASH_BANK ?= 0
MCU_FLASH_FILE_BIN ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).bin
MCU_FLASH_FILE_HEX ?= $(TOPDIR)/bin/$(MCU_BOARD_LC).hex
#MCU_FLASH_OFFSET ?= 0x0000000
#MCU_FLASH_SIZE ?= 0x5000
# -- direct memory access
MCU_MEM_FETCH_FILE_BIN ?= $(MCU_MEM_FILE_BIN)
MCU_MEM_FETCH_FILE_HEX ?= $(MCU_MEM_FILE_HEX)
MCU_MEM_FETCH_OFFSET ?= $(MCU_FLASH_OFFSET)
MCU_MEM_FETCH_SIZE ?= $(MCU_FLASH_SIZE)
ifneq ($(MCU_FLASH_FETCH_OFFSET),)
MCU_OBJCOPY_FETCH_OPTS += --change-addresses $(MCU_FLASH_FETCH_OFFSET)
MCU_MEM_PUSH_FILE_BIN ?= $(MCU_MEM_FILE_BIN)
MCU_MEM_PUSH_FILE_HEX ?= $(MCU_MEM_FILE_HEX)
MCU_MEM_PUSH_OFFSET ?= $(MCU_FLASH_OFFSET)
MCU_MEM_PUSH_SIZE ?= $(MCU_FLASH_SIZE)
MCU_MEM_FILE_BASE ?= $(MCU_BOARD_LC)-mem-$(MCU_MEM_FETCH_OFFSET)-$(MCU_MEM_FETCH_SIZE)
MCU_MEM_FILE_BIN ?= $(MCU_MEM_FILE_BASE).bin
MCU_MEM_FILE_HEX ?= $(MCU_MEM_FILE_BASE).hex
ifneq ($(MCU_MEM_FETCH_OFFSET),)
MCU_OBJCOPY_FETCH_OPTS += --change-addresses $(MCU_MEM_FETCH_OFFSET)
endif