From 106cbbc1254a3e4a336ba1a1b43fbf7cf1c39635 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sun, 29 Nov 2020 00:06:38 +0200 Subject: [PATCH] Link libgcc to bootloader and UVC. * Fixes link error in newer HALs. --- src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index f39906ea3..093c2f3d3 100755 --- a/src/Makefile +++ b/src/Makefile @@ -679,7 +679,7 @@ $(FIRMWARE): FIRMWARE_OBJS # up to the main fw image (MAIN_APP_ADDR), to generate a contiguous firmware.bin image. $(BOOTLOADER): FIRMWARE_OBJS BOOTLOADER_OBJS $(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 -lgcc $(OBJCOPY) -Obinary $(FW_DIR)/$(BOOTLOADER).elf $(FW_DIR)/$(BOOTLOADER).bin $(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 @@ -687,7 +687,7 @@ $(BOOTLOADER): FIRMWARE_OBJS BOOTLOADER_OBJS # This target generates the UVC firmware. $(UVC): FIRMWARE_OBJS UVC_OBJS $(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 -lgcc $(OBJCOPY) -Obinary $(FW_DIR)/$(UVC).elf $(FW_DIR)/$(UVC).bin $(PYTHON) $(MKDFU) -D $(DFU_DEVICE) -b $(MAIN_APP_ADDR):$(FW_DIR)/$(UVC).bin $(FW_DIR)/$(UVC).dfu