Make DFU device address configurable in board config files.

This commit is contained in:
iabdalkader 2020-09-17 18:10:26 +02:00
parent d1274ffa07
commit 590750d1c8
7 changed files with 10 additions and 4 deletions

View File

@ -624,7 +624,7 @@ $(FIRMWARE): FIRMWARE_OBJS
$(CPP) -P -E -I$(OMV_BOARD_CONFIG_DIR) $(OMV_DIR)/stm32fxxx.ld.S > $(BUILD)/stm32fxxx.lds $(CPP) -P -E -I$(OMV_BOARD_CONFIG_DIR) $(OMV_DIR)/stm32fxxx.ld.S > $(BUILD)/stm32fxxx.lds
$(CC) $(LDFLAGS) $(FIRM_OBJ) -o $(FW_DIR)/$(FIRMWARE).elf $(LIBS) $(CC) $(LDFLAGS) $(FIRM_OBJ) -o $(FW_DIR)/$(FIRMWARE).elf $(LIBS)
$(OBJCOPY) -Obinary $(FW_DIR)/$(FIRMWARE).elf $(FW_DIR)/$(FIRMWARE).bin $(OBJCOPY) -Obinary $(FW_DIR)/$(FIRMWARE).elf $(FW_DIR)/$(FIRMWARE).bin
$(PYTHON) $(MKDFU) -b $(MAIN_APP_ADDR):$(FW_DIR)/$(FIRMWARE).bin $(FW_DIR)/$(FIRMWARE).dfu $(PYTHON) $(MKDFU) -D $(DFU_DEVICE) -b $(MAIN_APP_ADDR):$(FW_DIR)/$(FIRMWARE).bin $(FW_DIR)/$(FIRMWARE).dfu
# This target generates the bootloader. The bootloader binary is generated twice, # This target generates the bootloader. The bootloader binary is generated twice,
# once without padding, to generate the bootloader.dfu file, and once with padding # once without padding, to generate the bootloader.dfu file, and once with padding
@ -633,7 +633,7 @@ $(BOOTLOADER): FIRMWARE_OBJS BOOTLOADER_OBJS
$(CPP) -P -E -I$(OMV_BOARD_CONFIG_DIR) $(BOOTLDR_DIR)/stm32fxxx.ld.S > $(BUILD)/$(BOOTLDR_DIR)/stm32fxxx.lds $(CPP) -P -E -I$(OMV_BOARD_CONFIG_DIR) $(BOOTLDR_DIR)/stm32fxxx.ld.S > $(BUILD)/$(BOOTLDR_DIR)/stm32fxxx.lds
$(CC) $(BOOTLDR_LDFLAGS) $(BOOT_OBJ) -o $(FW_DIR)/$(BOOTLOADER).elf $(CC) $(BOOTLDR_LDFLAGS) $(BOOT_OBJ) -o $(FW_DIR)/$(BOOTLOADER).elf
$(OBJCOPY) -Obinary $(FW_DIR)/$(BOOTLOADER).elf $(FW_DIR)/$(BOOTLOADER).bin $(OBJCOPY) -Obinary $(FW_DIR)/$(BOOTLOADER).elf $(FW_DIR)/$(BOOTLOADER).bin
$(PYTHON) $(MKDFU) -b 0x08000000:$(FW_DIR)/$(BOOTLOADER).bin $(FW_DIR)/$(BOOTLOADER).dfu $(PYTHON) $(MKDFU) -D $(DFU_DEVICE) -b 0x08000000:$(FW_DIR)/$(BOOTLOADER).bin $(FW_DIR)/$(BOOTLOADER).dfu
$(OBJCOPY) -Obinary --pad-to=$(MAIN_APP_ADDR) --gap-fill=0xFF $(FW_DIR)/$(BOOTLOADER).elf $(FW_DIR)/$(BOOTLOADER).bin $(OBJCOPY) -Obinary --pad-to=$(MAIN_APP_ADDR) --gap-fill=0xFF $(FW_DIR)/$(BOOTLOADER).elf $(FW_DIR)/$(BOOTLOADER).bin
# This target generates the UVC firmware. # This target generates the UVC firmware.
@ -641,12 +641,12 @@ $(UVC): FIRMWARE_OBJS UVC_OBJS
$(CPP) -P -E -I$(OMV_BOARD_CONFIG_DIR) $(UVC_DIR)/stm32fxxx.ld.S > $(BUILD)/$(UVC_DIR)/stm32fxxx.lds $(CPP) -P -E -I$(OMV_BOARD_CONFIG_DIR) $(UVC_DIR)/stm32fxxx.ld.S > $(BUILD)/$(UVC_DIR)/stm32fxxx.lds
$(CC) $(UVC_LDFLAGS) $(UVC_OBJ) -o $(FW_DIR)/$(UVC).elf $(CC) $(UVC_LDFLAGS) $(UVC_OBJ) -o $(FW_DIR)/$(UVC).elf
$(OBJCOPY) -Obinary $(FW_DIR)/$(UVC).elf $(FW_DIR)/$(UVC).bin $(OBJCOPY) -Obinary $(FW_DIR)/$(UVC).elf $(FW_DIR)/$(UVC).bin
$(PYTHON) $(MKDFU) -b $(MAIN_APP_ADDR):$(FW_DIR)/$(UVC).bin $(FW_DIR)/$(UVC).dfu $(PYTHON) $(MKDFU) -D $(DFU_DEVICE) -b $(MAIN_APP_ADDR):$(FW_DIR)/$(UVC).bin $(FW_DIR)/$(UVC).dfu
# This target generates a combined bootloader+main firmware image. # This target generates a combined bootloader+main firmware image.
$(OPENMV): $(BOOTLOADER) $(UVC) $(FIRMWARE) $(OPENMV): $(BOOTLOADER) $(UVC) $(FIRMWARE)
$(CAT) $(FW_DIR)/$(BOOTLOADER).bin $(FW_DIR)/$(FIRMWARE).bin > $(FW_DIR)/$(OPENMV).bin $(CAT) $(FW_DIR)/$(BOOTLOADER).bin $(FW_DIR)/$(FIRMWARE).bin > $(FW_DIR)/$(OPENMV).bin
$(PYTHON) $(MKDFU) -b 0x08000000:$(FW_DIR)/$(BOOTLOADER).bin -b $(MAIN_APP_ADDR):$(FW_DIR)/$(FIRMWARE).bin $(FW_DIR)/$(OPENMV).dfu $(PYTHON) $(MKDFU) -D $(DFU_DEVICE) -b 0x08000000:$(FW_DIR)/$(BOOTLOADER).bin -b $(MAIN_APP_ADDR):$(FW_DIR)/$(FIRMWARE).bin $(FW_DIR)/$(OPENMV).dfu
$(SIZE) $(FW_DIR)/$(BOOTLOADER).elf $(SIZE) $(FW_DIR)/$(BOOTLOADER).elf
$(SIZE) $(FW_DIR)/$(FIRMWARE).elf $(SIZE) $(FW_DIR)/$(FIRMWARE).elf

View File

@ -9,4 +9,5 @@ STARTUP=startup_stm32f407xx
VECT_TAB_OFFSET=0x10000 VECT_TAB_OFFSET=0x10000
MAIN_APP_ADDR=0x08010000 MAIN_APP_ADDR=0x08010000
OMV_HSE_VALUE=12000000 OMV_HSE_VALUE=12000000
DFU_DEVICE=0x0483:0xdf11
MICROPY_PY_WINC1500 = 1 MICROPY_PY_WINC1500 = 1

View File

@ -9,4 +9,5 @@ STARTUP=startup_stm32f427xx
VECT_TAB_OFFSET=0x10000 VECT_TAB_OFFSET=0x10000
MAIN_APP_ADDR=0x08010000 MAIN_APP_ADDR=0x08010000
OMV_HSE_VALUE=12000000 OMV_HSE_VALUE=12000000
DFU_DEVICE=0x0483:0xdf11
MICROPY_PY_WINC1500 = 1 MICROPY_PY_WINC1500 = 1

View File

@ -9,6 +9,7 @@ STARTUP=startup_stm32f765xx
VECT_TAB_OFFSET=0x20000 VECT_TAB_OFFSET=0x20000
MAIN_APP_ADDR=0x08020000 MAIN_APP_ADDR=0x08020000
OMV_HSE_VALUE=12000000 OMV_HSE_VALUE=12000000
DFU_DEVICE=0x0483:0xdf11
FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries
MICROPY_PY_ULAB = 1 MICROPY_PY_ULAB = 1
MICROPY_PY_WINC1500 = 1 MICROPY_PY_WINC1500 = 1

View File

@ -9,6 +9,7 @@ STARTUP=startup_stm32h743xx
VECT_TAB_OFFSET=0x40000 VECT_TAB_OFFSET=0x40000
MAIN_APP_ADDR=0x08040000 MAIN_APP_ADDR=0x08040000
OMV_HSE_VALUE=12000000 OMV_HSE_VALUE=12000000
DFU_DEVICE=0x0483:0xdf11
FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries
MICROPY_PY_ULAB = 1 MICROPY_PY_ULAB = 1
MICROPY_PY_WINC1500 = 1 MICROPY_PY_WINC1500 = 1

View File

@ -9,6 +9,7 @@ STARTUP=startup_stm32h743xx
VECT_TAB_OFFSET=0x40000 VECT_TAB_OFFSET=0x40000
MAIN_APP_ADDR=0x08040000 MAIN_APP_ADDR=0x08040000
OMV_HSE_VALUE=12000000 OMV_HSE_VALUE=12000000
DFU_DEVICE=0x0483:0xdf11
FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries
MICROPY_PY_ULAB = 1 MICROPY_PY_ULAB = 1
MICROPY_PY_WINC1500 = 1 MICROPY_PY_WINC1500 = 1

View File

@ -9,6 +9,7 @@ STARTUP=startup_stm32h747xx
VECT_TAB_OFFSET=0x40000 VECT_TAB_OFFSET=0x40000
MAIN_APP_ADDR=0x08040000 MAIN_APP_ADDR=0x08040000
OMV_HSE_VALUE=27000000 OMV_HSE_VALUE=27000000
DFU_DEVICE=0x2341:0x035b
FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries
OMV_BOARD_EXTRA_CFLAGS = -DCORE_CM7 OMV_BOARD_EXTRA_CFLAGS = -DCORE_CM7
MICROPY_PY_ULAB = 1 MICROPY_PY_ULAB = 1