Skip to content

Commit 734012a

Browse files
hierophecthierophect
committed
Makefile cleanup
1 parent 755b86e commit 734012a

8 files changed

Lines changed: 483 additions & 476 deletions

File tree

‎ports/stm32f4/Makefile‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,22 @@ else
8787
### CFLAGS += -flto
8888
endif
8989

90-
# C defines
91-
#C_DEFS = \
92-
#-DUSE_FULL_LL_DRIVER \
93-
#-DUSE_HAL_DRIVER \
94-
#-DSTM32F412Zx \
90+
# C defines and other board specifics
91+
ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
92+
C_DEFS = \
93+
-DUSE_FULL_LL_DRIVER \
94+
-DUSE_HAL_DRIVER \
95+
-DSTM32F412Zx
96+
endif
9597

96-
# C defines
98+
ifeq ($(MCU_SUB_VARIANT), stm32f411xe)
9799
C_DEFS = \
98100
-DUSE_HAL_DRIVER \
99-
-DSTM32F411xE \
101+
-DSTM32F411xE
102+
CIRCUITPY_BOARD = 0
103+
CIRCUITPY_DIGITALIO = 0
104+
CIRCUITPY_MICROCONTROLLER = 0
105+
endif
100106

101107
#TODO: Add ASM Flags? -Werror
102108
CFLAGS += $(INC) -Wall -std=gnu11 -nostdlib $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT)
@@ -118,8 +124,6 @@ CFLAGS += \
118124
# TODO: check this
119125
CFLAGS += -D__START=main
120126

121-
#TODO: add LD file?
122-
123127
LDFLAGS = $(CFLAGS) -fshort-enums -Wl,-nostdlib -Wl,-T,$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nano.specs
124128
LIBS := -lgcc -lc
125129

@@ -131,7 +135,6 @@ LIBS += -lm
131135
endif
132136

133137
# TinyUSB defines
134-
# TODO: make this stm32
135138
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_STM32F4 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD_CDC_TX_BUFSIZE=1024 -DCFG_TUD_MSC_BUFSIZE=4096 -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_MIDI_TX_BUFSIZE=128
136139

137140

@@ -194,18 +197,19 @@ SRC_C += \
194197
lib/utils/pyexec.c \
195198
lib/utils/stdout_helpers.c \
196199
lib/utils/sys_stdio_mphal.c \
197-
supervisor/shared/memory.c \
198-
lib/tinyusb/src/portable/st/stm32f4/dcd_stm32f4.c
200+
supervisor/shared/memory.c
201+
202+
ifneq ($(USB),FALSE)
203+
SRC_C += lib/tinyusb/src/portable/st/stm32f4/dcd_stm32f4.c
204+
endif
199205

200-
# peripherals/stm32f4/stm32f412zg/pins.c \
206+
ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
207+
SRC_C += peripherals/stm32f4/stm32f412zg/pins.c
208+
endif
201209

202210
SRC_S = \
203211
supervisor/cpu.s \
204-
boards/startup_stm32f411xe.s
205-
# boards/startup_stm32f412zx.s
206-
# boards/startup_stm32f411xe.s
207-
208-
#boards/startup_stm32f412zx.s
212+
boards/startup_$(MCU_SUB_VARIANT).s
209213

210214
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
211215
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \

‎ports/stm32f4/boards/stm32f411_disco/mpconfigboard.mk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ USB_PID = 0x802A
33
USB_PRODUCT = "A glorious potato"
44
USB_MANUFACTURER = "Adafruit Industries LLC"
55

6-
MCU_SERIES = f4
6+
MCU_SERIES = m4
7+
MCU_VARIANT = stm32f4
8+
MCU_SUB_VARIANT = stm32f411xe
79
CMSIS_MCU = STM32F411xE
810
LD_FILE = boards/STM32F411VETx_FLASH.ld
911
TEXT0_ADDR = 0x08000000

‎ports/stm32f4/boards/stm32f412g_disco/mpconfigboard.mk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
88
#USB_PRODUCT = "STM32 Human Interface Potato"
99
#USB_MANUFACTURER = "STMicroelectronics"
1010

11-
MCU_SERIES = f4
11+
MCU_SERIES = m4
12+
MCU_VARIANT = stm32f4
13+
MCU_SUB_VARIANT = stm32f412zx
1214
CMSIS_MCU = STM32F412xG
1315
LD_FILE = boards/STM32F412ZGTx_FLASH.ld
1416
TEXT0_ADDR = 0x08000000

‎ports/stm32f4/mpconfigport.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ CIRCUITPY_AUDIOBUSIO = 0
3434
CIRCUITPY_AUDIOIO = 0
3535
CIRCUITPY_BITBANGIO = 0
3636
CIRCUITPY_BLEIO = 0
37-
CIRCUITPY_BOARD = 0
37+
CIRCUITPY_BOARD = 1
3838
CIRCUITPY_BUSIO = 0
39-
CIRCUITPY_DIGITALIO = 0
39+
CIRCUITPY_DIGITALIO = 1
4040
CIRCUITPY_DISPLAYIO = 0
4141
CIRCUITPY_FREQUENCYIO = 0
4242
CIRCUITPY_GAMEPAD = 0
4343
CIRCUITPY_GAMEPADSHIFT = 0
4444
CIRCUITPY_I2CSLAVE = 0
4545
CIRCUITPY_MATH = 0
46-
CIRCUITPY_MICROCONTROLLER = 0
46+
CIRCUITPY_MICROCONTROLLER = 1
4747
CIRCUITPY_NEOPIXEL_WRITE = 0
4848
CIRCUITPY_NETWORK = 0
4949
CIRCUITPY_NVM = 0

0 commit comments

Comments
 (0)