Skip to content

Commit 0435e76

Browse files
dpgeorgedpgeorge
committed
stmhal: Make ld and af files configurable within Makefile.
Each board now needs an mpconfigboard.mk file which defines AF_FILE and LD_FILE. Also moved stm32f405.ld to boards/ directory to keep things organised.
1 parent 03ec6e4 commit 0435e76

9 files changed

Lines changed: 16 additions & 2 deletions

File tree

‎stmhal/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ BUILD ?= build-$(BOARD)
1010

1111
include ../py/mkenv.mk
1212
-include mpconfigport.mk
13+
include boards/$(BOARD)/mpconfigboard.mk
1314

1415
# qstr definitions (must come before including py.mk)
1516
QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
@@ -45,7 +46,7 @@ CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -m
4546
CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_CORTEX_M4) $(COPT)
4647
CFLAGS += -Iboards/$(BOARD)
4748

48-
LDFLAGS = -nostdlib -T stm32f405.ld -Map=$(@:.elf=.map) --cref
49+
LDFLAGS = -nostdlib -T $(LD_FILE) -Map=$(@:.elf=.map) --cref
4950
LIBS =
5051

5152
# Debugging/Optimization
@@ -275,7 +276,6 @@ $(BUILD)/firmware.elf: $(OBJ)
275276

276277
MAKE_PINS = boards/make-pins.py
277278
BOARD_PINS = boards/$(BOARD)/pins.csv
278-
AF_FILE = boards/stm32f4xx_af.csv
279279
PREFIX_FILE = boards/stm32f4xx_prefix.c
280280
GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
281281
GEN_PINS_HDR = $(HEADER_BUILD)/pins.h

‎stmhal/boards/CERB40/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
AF_FILE = boards/stm32f405_af.csv
2+
LD_FILE = boards/stm32f405.ld

‎stmhal/boards/HYDRABUS/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
AF_FILE = boards/stm32f405_af.csv
2+
LD_FILE = boards/stm32f405.ld

‎stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
AF_FILE = boards/stm32f405_af.csv
2+
LD_FILE = boards/stm32f405.ld

‎stmhal/boards/PYBV10/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
AF_FILE = boards/stm32f405_af.csv
2+
LD_FILE = boards/stm32f405.ld

‎stmhal/boards/PYBV3/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
AF_FILE = boards/stm32f405_af.csv
2+
LD_FILE = boards/stm32f405.ld

‎stmhal/boards/PYBV4/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
AF_FILE = boards/stm32f405_af.csv
2+
LD_FILE = boards/stm32f405.ld

‎stmhal/boards/STM32F4DISC/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
AF_FILE = boards/stm32f405_af.csv
2+
LD_FILE = boards/stm32f405.ld

stmhal/stm32f405.ld renamed to stmhal/boards/stm32f405.ld

File renamed without changes.

0 commit comments

Comments
 (0)