Skip to content

Commit 9930863

Browse files
committed
fix iar ci
1 parent 5c537c2 commit 9930863

File tree

8 files changed

+26
-17
lines changed

8 files changed

+26
-17
lines changed

examples/rules.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,34 +139,34 @@ $(BUILD)/obj/%_asm.o: %.S
139139
@echo AS $(notdir $@)
140140
@$(AS) $(ASFLAGS) -c -o $@ $<
141141

142-
ifndef USE_IAR
143-
# GCC based compiler
142+
ifdef USE_IAR
143+
# IAR Compiler
144144
$(BUILD)/$(PROJECT).bin: $(BUILD)/$(PROJECT).elf
145145
@echo CREATE $@
146-
@$(OBJCOPY) -O binary $^ $@
146+
@$(OBJCOPY) --silent --bin $^ $@
147147

148148
$(BUILD)/$(PROJECT).hex: $(BUILD)/$(PROJECT).elf
149149
@echo CREATE $@
150-
@$(OBJCOPY) -O ihex $^ $@
150+
@$(OBJCOPY) --silent --ihex $^ $@
151151

152152
$(BUILD)/$(PROJECT).elf: $(OBJ)
153153
@echo LINK $@
154-
@$(LD) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group
154+
@$(LD) -o $@ $(IAR_LDFLAGS) $^
155155

156156
else
157-
158-
# IAR Compiler
157+
# GCC based compiler
159158
$(BUILD)/$(PROJECT).bin: $(BUILD)/$(PROJECT).elf
160159
@echo CREATE $@
161-
@$(OBJCOPY) --silent --bin $^ $@
160+
@$(OBJCOPY) -O binary $^ $@
162161

163162
$(BUILD)/$(PROJECT).hex: $(BUILD)/$(PROJECT).elf
164163
@echo CREATE $@
165-
@$(OBJCOPY) --silent --ihex $^ $@
164+
@$(OBJCOPY) -O ihex $^ $@
166165

167166
$(BUILD)/$(PROJECT).elf: $(OBJ)
168167
@echo LINK $@
169-
@$(LD) -o $@ $(IAR_LDFLAGS) $^
168+
@$(LD) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group
169+
170170
endif
171171

172172
# UF2 generation, iMXRT need to strip to text only before conversion

hw/bsp/stm32f0/family.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ SRC_C += \
4242
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \
4343
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \
4444
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \
45-
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c
45+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_dma.c \
46+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \
47+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart_ex.c
4648

4749
INC += \
4850
$(TOP)/$(BOARD_PATH) \

hw/bsp/stm32f4/family.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ SRC_C += \
4242
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \
4343
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \
4444
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \
45+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_dma.c \
4546
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c
4647

4748
INC += \

hw/bsp/stm32f7/family.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ SRC_C += \
5252
$(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
5353
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
5454
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
55+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_dma.c \
5556
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \
5657
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \
5758
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \

hw/bsp/stm32g4/family.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ SRC_C += \
4343
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \
4444
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \
4545
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \
46+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart_ex.c \
4647
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c
4748

4849
INC += \

hw/bsp/stm32h7/family.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,13 @@ SRC_C += \
5252
$(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
5353
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
5454
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
55+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_dma.c \
5556
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \
5657
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \
5758
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \
5859
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \
60+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart_ex.c \
61+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr.c \
5962
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr_ex.c
6063

6164
INC += \

hw/bsp/stm32l4/family.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@ SRC_C += \
3939
$(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
4040
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
4141
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
42+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_dma.c \
4243
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \
4344
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \
4445
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr.c \
4546
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_pwr_ex.c \
4647
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \
47-
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c
48+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c \
49+
$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart_ex.c
4850

4951
INC += \
5052
$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \

tools/build_utils.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@ def build_size(example, board):
120120
text_title = 'text data bss dec'
121121
if text_title in l:
122122
size_list = size_output[i+1].split('\t')
123-
break
124-
125-
flash_size = int(size_list[0])
126-
sram_size = int(size_list[1]) + int(size_list[2])
127-
return (flash_size, sram_size)
123+
flash_size = int(size_list[0])
124+
sram_size = int(size_list[1]) + int(size_list[2])
125+
return (flash_size, sram_size)
128126

127+
return (0, 0)

0 commit comments

Comments
 (0)