Skip to content

Commit 81b1bfc

Browse files
dpgeorgedpgeorge
committed
stm32: Rework board variant support to require mpconfigvariant file.
Following how the board variants now work in the esp8266 port. Signed-off-by: Damien George <[email protected]>
1 parent daa948f commit 81b1bfc

16 files changed

+28
-54
lines changed

‎ports/stm32/Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
1313
$(error Invalid BOARD specified: $(BOARD_DIR))
1414
endif
1515

16+
ifneq ($(BOARD_VARIANT),)
17+
ifeq ($(wildcard $(BOARD_DIR)/mpconfigvariant_$(BOARD_VARIANT).mk),)
18+
$(error Invalid BOARD_VARIANT specified: $(BOARD_VARIANT))
19+
endif
20+
endif
21+
1622
# If the build directory is not given, make it reflect the board name (and
1723
# optionally the board variant).
1824
ifneq ($(BOARD_VARIANT),)
@@ -23,7 +29,14 @@ endif
2329

2430
include ../../py/mkenv.mk
2531
-include mpconfigport.mk
32+
33+
# Include board specific .mk file, and optional board variant .mk file.
2634
include $(BOARD_DIR)/mpconfigboard.mk
35+
ifeq ($(BOARD_VARIANT),)
36+
-include $(BOARD_DIR)/mpconfigvariant.mk
37+
else
38+
include $(BOARD_DIR)/mpconfigvariant_$(BOARD_VARIANT).mk
39+
endif
2740

2841
# qstr definitions (must come before including py.mk)
2942
QSTR_DEFS += qstrdefsport.h

‎ports/stm32/boards/PYBLITEV10/mpconfigboard.mk

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,5 @@ LD_FILES = boards/stm32f411.ld boards/common_ifs.ld
55
TEXT0_ADDR = 0x08000000
66
TEXT1_ADDR = 0x08020000
77

8-
# Provide different variants for the downloads page.
9-
ifeq ($(BOARD_VARIANT),DP)
10-
MICROPY_FLOAT_IMPL=double
11-
endif
12-
13-
ifeq ($(BOARD_VARIANT),THREAD)
14-
CFLAGS += -DMICROPY_PY_THREAD=1
15-
endif
16-
17-
ifeq ($(BOARD_VARIANT),DP_THREAD)
18-
MICROPY_FLOAT_IMPL=double
19-
CFLAGS += -DMICROPY_PY_THREAD=1
20-
endif
21-
22-
ifeq ($(BOARD_VARIANT),NETWORK)
23-
MICROPY_PY_NETWORK_WIZNET5K=5200
24-
endif
25-
268
# PYB-specific frozen modules
279
FROZEN_MANIFEST ?= boards/PYBV10/manifest.py

‎ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MICROPY_FLOAT_IMPL = double

‎ports/stm32/boards/PYBLITEV10/mpconfigvariant_DP_THREAD.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MICROPY_FLOAT_IMPL = double
2+
CFLAGS += -DMICROPY_PY_THREAD=1

‎ports/stm32/boards/PYBLITEV10/mpconfigvariant_NETWORK.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MICROPY_PY_NETWORK_WIZNET5K = 5200

‎ports/stm32/boards/PYBLITEV10/mpconfigvariant_THREAD.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CFLAGS += -DMICROPY_PY_THREAD=1

‎ports/stm32/boards/PYBV10/mpconfigboard.mk

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,5 @@ endif
1515
# MicroPython settings
1616
MICROPY_VFS_LFS2 = 1
1717

18-
# Provide different variants for the downloads page.
19-
ifeq ($(BOARD_VARIANT),DP)
20-
MICROPY_FLOAT_IMPL=double
21-
endif
22-
23-
ifeq ($(BOARD_VARIANT),THREAD)
24-
CFLAGS += -DMICROPY_PY_THREAD=1
25-
endif
26-
27-
ifeq ($(BOARD_VARIANT),DP_THREAD)
28-
MICROPY_FLOAT_IMPL=double
29-
CFLAGS += -DMICROPY_PY_THREAD=1
30-
endif
31-
32-
ifeq ($(BOARD_VARIANT),NETWORK)
33-
MICROPY_PY_NETWORK_WIZNET5K=5200
34-
endif
35-
3618
# PYB-specific frozen modules
3719
FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py

‎ports/stm32/boards/PYBV10/mpconfigvariant_DP.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MICROPY_FLOAT_IMPL = double

‎ports/stm32/boards/PYBV10/mpconfigvariant_DP_THREAD.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MICROPY_FLOAT_IMPL = double
2+
CFLAGS += -DMICROPY_PY_THREAD=1

‎ports/stm32/boards/PYBV10/mpconfigvariant_NETWORK.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MICROPY_PY_NETWORK_WIZNET5K = 5200

‎ports/stm32/boards/PYBV10/mpconfigvariant_THREAD.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CFLAGS += -DMICROPY_PY_THREAD=1

‎ports/stm32/boards/PYBV11/mpconfigboard.mk

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,5 @@ endif
1515
# MicroPython settings
1616
MICROPY_VFS_LFS2 = 1
1717

18-
# Provide different variants for the downloads page.
19-
ifeq ($(BOARD_VARIANT),DP)
20-
MICROPY_FLOAT_IMPL=double
21-
endif
22-
23-
ifeq ($(BOARD_VARIANT),THREAD)
24-
CFLAGS += -DMICROPY_PY_THREAD=1
25-
endif
26-
27-
ifeq ($(BOARD_VARIANT),DP_THREAD)
28-
MICROPY_FLOAT_IMPL=double
29-
CFLAGS += -DMICROPY_PY_THREAD=1
30-
endif
31-
32-
ifeq ($(BOARD_VARIANT),NETWORK)
33-
MICROPY_PY_NETWORK_WIZNET5K=5200
34-
endif
35-
3618
# PYB-specific frozen modules
3719
FROZEN_MANIFEST ?= boards/PYBV10/manifest.py

‎ports/stm32/boards/PYBV11/mpconfigvariant_DP.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MICROPY_FLOAT_IMPL = double

‎ports/stm32/boards/PYBV11/mpconfigvariant_DP_THREAD.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MICROPY_FLOAT_IMPL = double
2+
CFLAGS += -DMICROPY_PY_THREAD=1

‎ports/stm32/boards/PYBV11/mpconfigvariant_NETWORK.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MICROPY_PY_NETWORK_WIZNET5K = 5200

‎ports/stm32/boards/PYBV11/mpconfigvariant_THREAD.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CFLAGS += -DMICROPY_PY_THREAD=1

0 commit comments

Comments
 (0)