djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/mboot: Allow a board to add source files to the build.

Browse Source 
A board can now use BUILDING_MBOOT at the Makefile-level to do things
conditional on building mboot, for example add source files to SRC_C.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2021-04-28 16:10:42 +10:00
parent 885b246ca9
commit ef2896bdea
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/stm32/mboot/Makefile
View File

@ -23,6 +23,9 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
$(error Invalid BOARD specified: $(BOARD_DIR)) $(error Invalid BOARD specified: $(BOARD_DIR))
endif endif
# Enable BUILDING_MBOOT so boards can configure their .mk file accordingly.
BUILDING_MBOOT = 1
include ../../../py/mkenv.mk include ../../../py/mkenv.mk
include $(BOARD_DIR)/mpconfigboard.mk include $(BOARD_DIR)/mpconfigboard.mk
@ -78,7 +81,7 @@ CFLAGS += -DAPPLICATION_ADDR=$(TEXT0_ADDR)
CFLAGS += -DFFCONF_H=\"ports/stm32/mboot/ffconf.h\" CFLAGS += -DFFCONF_H=\"ports/stm32/mboot/ffconf.h\"
CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
CFLAGS += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT -DLFS2_READONLY CFLAGS += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT -DLFS2_READONLY
CFLAGS += -DBUILDING_MBOOT=1 CFLAGS += -DBUILDING_MBOOT=$(BUILDING_MBOOT)
CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0 CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID) CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)
@ -98,7 +101,7 @@ COPT += -Os -DNDEBUG
endif endif
$(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN) $(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
LIB_SRC_C = \ LIB_SRC_C += \
lib/libc/string0.c \ lib/libc/string0.c \
lib/littlefs/lfs1.c \ lib/littlefs/lfs1.c \
lib/littlefs/lfs1_util.c \ lib/littlefs/lfs1_util.c \
@ -111,7 +114,7 @@ LIB_SRC_C = \
extmod/uzlib/tinflate.c \ extmod/uzlib/tinflate.c \
extmod/uzlib/tinfgzip.c extmod/uzlib/tinfgzip.c
SRC_C = \ SRC_C += \
main.c \ main.c \
elem.c \ elem.c \
fsload.c \ fsload.c \
@ -131,7 +134,7 @@ SRC_C = \
ports/stm32/usbd_conf.c \ ports/stm32/usbd_conf.c \
$(wildcard $(BOARD_DIR)/*.c) $(wildcard $(BOARD_DIR)/*.c)
SRC_O = \ SRC_O += \
$(STARTUP_FILE) \ $(STARTUP_FILE) \
$(SYSTEM_FILE) \ $(SYSTEM_FILE) \
ports/stm32/resethandler.o \ ports/stm32/resethandler.o \
@ -146,7 +149,7 @@ CFLAGS += -DMBOOT_PACK_KEYS_FILE=\"$(MBOOT_PACK_KEYS_FILE)\"
endif endif
$(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_ll_usb.o: CFLAGS += -Wno-attributes $(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_ll_usb.o: CFLAGS += -Wno-attributes
SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\ SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
hal_cortex.c \ hal_cortex.c \
hal_flash.c \ hal_flash.c \
hal_flash_ex.c \ hal_flash_ex.c \
@ -155,13 +158,12 @@ SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
ll_usb.c \ ll_usb.c \
) )
SRC_USBDEV = $(addprefix ports/stm32/$(USBDEV_DIR)/,\ SRC_USBDEV += $(addprefix ports/stm32/$(USBDEV_DIR)/,\
core/src/usbd_core.c \ core/src/usbd_core.c \
core/src/usbd_ctlreq.c \ core/src/usbd_ctlreq.c \
core/src/usbd_ioreq.c \ core/src/usbd_ioreq.c \
) )
OBJ =
OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(SRC_O)) OBJ += $(addprefix $(BUILD)/, $(SRC_O))