Skip to content

Commit 2216704

Browse files
hathachhathach
committed
rename GCC_CFLAGS to CFLAGS_GCC, GCC_SRC_S to SRC_S_GCC etc ..
1 parent 7d0ce56 commit 2216704

File tree

45 files changed

+173
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+173
-174
lines changed

‎hw/bsp/stm32f0/boards/stm32f070rbnucleo/board.mk

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
CFLAGS += -DSTM32F070xB -DCFG_EXAMPLE_VIDEO_READONLY
22

3-
# GCC
4-
GCC_SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f070xb.s
5-
GCC_LD_FILE = $(BOARD_PATH)/stm32F070rbtx_flash.ld
6-
7-
# IAR
8-
IAR_SRC_S += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f070xb.s
9-
IAR_LD_FILE = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f070xb_flash.icf
3+
# Linker
4+
LD_FILE_GCC = $(BOARD_PATH)/stm32F070rbtx_flash.ld
105

116
# For flash-jlink target
127
JLINK_DEVICE = stm32f070rb

‎hw/bsp/stm32f0/boards/stm32f072disco/board.mk

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
CFLAGS += -DSTM32F072xB -DCFG_EXAMPLE_VIDEO_READONLY
1+
MCU_VARIANT = stm32f072xb
22

3-
GCC_SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f072xb.s
4-
GCC_LD_FILE = $(BOARD_PATH)/STM32F072RBTx_FLASH.ld
3+
CFLAGS += -DSTM32F072xB -DCFG_EXAMPLE_VIDEO_READONLY
54

6-
IAR_SRC_S += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f072xb.s
7-
IAR_LD_FILE = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f072xb_flash.icf
5+
# Linker
6+
LD_FILE_GCC = $(BOARD_PATH)/STM32F072RBTx_FLASH.ld
87

98
# For flash-jlink target
109
JLINK_DEVICE = stm32f072rb

‎hw/bsp/stm32f0/boards/stm32f072eval/board.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
CFLAGS += -DSTM32F072xB -DLSI_VALUE=40000 -DCFG_EXAMPLE_VIDEO_READONLY
22

3-
GCC_SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f072xb.s
4-
GCC_LD_FILE = $(BOARD_PATH)/STM32F072VBTx_FLASH.ld
3+
SRC_S_GCC += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f072xb.s
4+
LD_FILE_GCC = $(BOARD_PATH)/STM32F072VBTx_FLASH.ld
55

6-
IAR_SRC_S += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f072xb.s
7-
IAR_LD_FILE = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f072xb_flash.icf
6+
SRC_S_IAR += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f072xb.s
7+
LD_FILE_IAR = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f072xb_flash.icf
88

99
# For flash-jlink target
1010
JLINK_DEVICE = stm32f072vb

‎hw/bsp/stm32f0/family.mk

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ CFLAGS += \
1616
-DCFG_TUSB_MCU=OPT_MCU_STM32F0
1717

1818
# GCC Flags
19-
GCC_CFLAGS += \
19+
CFLAGS_GCC += \
2020
-flto \
2121
-nostdlib -nostartfiles \
2222

2323
# suppress warning caused by vendor mcu driver
24-
GCC_CFLAGS += -Wno-error=unused-parameter -Wno-error=cast-align
24+
CFLAGS_GCC += -Wno-error=unused-parameter -Wno-error=cast-align
2525

2626
# ------------------------
2727
# All source paths should be relative to the top level.
@@ -44,3 +44,10 @@ INC += \
4444
$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
4545
$(TOP)/$(ST_CMSIS)/Include \
4646
$(TOP)/$(ST_HAL_DRIVER)/Inc
47+
48+
# Startup
49+
SRC_S_GCC += $(ST_CMSIS)/Source/Templates/gcc/startup_$(MCU_VARIANT).s
50+
SRC_S_IAR += $(ST_CMSIS)/Source/Templates/iar/startup_$(MCU_VARIANT).s
51+
52+
# Linker
53+
LD_FILE_IAR = $(ST_CMSIS)/Source/Templates/iar/linker/$(MCU_VARIANT)_flash.icf

‎hw/bsp/stm32f1/boards/stm32f103_bluepill/board.mk

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
CFLAGS += -DSTM32F103xB -DHSE_VALUE=8000000U -DCFG_EXAMPLE_VIDEO_READONLY
1+
MCU_VARIANT = stm32f103xb
22

3-
# GCC
4-
GCC_SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f103xb.s
5-
GCC_LD_FILE = $(BOARD_PATH)/STM32F103X8_FLASH.ld
3+
CFLAGS += -DSTM32F103xB -DHSE_VALUE=8000000U -DCFG_EXAMPLE_VIDEO_READONLY
64

7-
# IAR
8-
IAR_SRC_S += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f103xb.s
9-
IAR_LD_FILE = $(BOARD_PATH)/stm32f103x8_flash.icf
5+
# Linker
6+
LD_FILE_GCC = $(BOARD_PATH)/STM32F103X8_FLASH.ld
7+
LD_FILE_IAR = $(BOARD_PATH)/stm32f103x8_flash.icf
108

119
# For flash-jlink target
1210
JLINK_DEVICE = stm32f103c8

‎hw/bsp/stm32f1/boards/stm32f103_mini_2/board.mk

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
CFLAGS += -DSTM32F103xB -DHSE_VALUE=8000000U
1+
MCU_VARIANT = stm32f103xb
22

3-
# GCC
4-
GCC_SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f103xb.s
5-
GCC_LD_FILE = $(BOARD_PATH)/STM32F103XC_FLASH.ld
3+
CFLAGS += -DSTM32F103xB -DHSE_VALUE=8000000U
64

7-
# IAR
8-
IAR_SRC_S += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f103xb.s
9-
IAR_LD_FILE = $(BOARD_PATH)/stm32f103xc_flash.icf
5+
# Linker
6+
LD_FILE_GCC = $(BOARD_PATH)/STM32F103XC_FLASH.ld
7+
LD_FILE_IAR = $(BOARD_PATH)/stm32f103xc_flash.icf
108

119
# For flash-jlink target
1210
JLINK_DEVICE = stm32f103rc

‎hw/bsp/stm32f1/family.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CFLAGS += \
1414
-DCFG_TUSB_MCU=OPT_MCU_STM32F1
1515

1616
# GCC Flags
17-
GCC_CFLAGS += \
17+
CFLAGS_GCC += \
1818
-flto \
1919
-nostdlib -nostartfiles \
2020

@@ -36,6 +36,10 @@ INC += \
3636
$(TOP)/$(ST_CMSIS)/Include \
3737
$(TOP)/$(ST_HAL_DRIVER)/Inc
3838

39+
# Startup
40+
SRC_S_GCC += $(ST_CMSIS)/Source/Templates/gcc/startup_$(MCU_VARIANT).s
41+
SRC_S_IAR += $(ST_CMSIS)/Source/Templates/iar/startup_$(MCU_VARIANT).s
42+
3943
# flash target ROM bootloader
4044
flash-dfu-util: $(BUILD)/$(PROJECT).bin
4145
dfu-util -R -a 0 --dfuse-address 0x08000000 -D $<

‎hw/bsp/stm32f2/family.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ CPU_CORE ?= cortex-m3
1414
CFLAGS += \
1515
-DCFG_TUSB_MCU=OPT_MCU_STM32F2
1616

17-
GCC_CFLAGS += \
17+
CFLAGS_GCC += \
1818
-flto \
1919
-nostdlib -nostartfiles \
2020

2121
# mcu driver cause following warnings
22-
GCC_CFLAGS += -Wno-error=sign-compare
22+
CFLAGS_GCC += -Wno-error=sign-compare
2323

2424
SRC_C += \
2525
src/portable/synopsys/dwc2/dcd_dwc2.c \

‎hw/bsp/stm32f4/boards/feather_stm32f405/board.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
CFLAGS += -DSTM32F405xx
22

33
# GCC
4-
GCC_SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f405xx.s
5-
GCC_LD_FILE = $(BOARD_PATH)/STM32F405RGTx_FLASH.ld
4+
SRC_S_GCC += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f405xx.s
5+
LD_FILE_GCC = $(BOARD_PATH)/STM32F405RGTx_FLASH.ld
66

77
# IAR
8-
IAR_SRC_S += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f405xx.s
9-
IAR_LD_FILE = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f405xx_flash.icf
8+
SRC_S_IAR += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f405xx.s
9+
LD_FILE_IAR = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f405xx_flash.icf
1010

1111
# For flash-jlink target
1212
JLINK_DEVICE = stm32f405rg

‎hw/bsp/stm32f4/boards/pyboardv11/board.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
CFLAGS += -DSTM32F405xx
22

33
# GCC
4-
GCC_SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f405xx.s
5-
GCC_LD_FILE = $(BOARD_PATH)/STM32F405RGTx_FLASH.ld
4+
SRC_S_GCC += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f405xx.s
5+
LD_FILE_GCC = $(BOARD_PATH)/STM32F405RGTx_FLASH.ld
66

77
# IAR
8-
IAR_SRC_S += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f405xx.s
9-
IAR_LD_FILE = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f405xx_flash.icf
8+
SRC_S_IAR += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f405xx.s
9+
LD_FILE_IAR = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f405xx_flash.icf
1010

1111
# For flash-jlink target
1212
JLINK_DEVICE = stm32f405rg

0 commit comments

Comments
 (0)