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

stm32/Makefile: Rename SRC_LIB to LIB_SRC_C to match other ports.

Browse Source
This commit is contained in:
Jim Mussared 2020-04-07 14:50:56 +10:00 committed by Damien George
parent cb5994d96e
commit 0da47ecc93
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extmod/btstack/btstack.mk
View File

@ -32,7 +32,7 @@ SRC_BTSTACK += \
$(addprefix lib/btstack/src/classic/, $(SRC_CLASSIC_FILES)) $(addprefix lib/btstack/src/classic/, $(SRC_CLASSIC_FILES))
endif endif
SRC_LIB += $(SRC_BTSTACK) LIB_SRC_C += $(SRC_BTSTACK)
#$(BUILD)/lib/btstack/src/classic/btstack_link_key_db_static.o: CFLAGS += -Wno-error=pointer-arith #$(BUILD)/lib/btstack/src/classic/btstack_link_key_db_static.o: CFLAGS += -Wno-error=pointer-arith
@ -43,6 +43,4 @@ $(BUILD)/lib/btstack/src/classic/btstack_link_key_db_tlv.o: CFLAGS += -Wno-error
$(BUILD)/lib/btstack/src/classic/goep_client.o: CFLAGS += -Wno-error=format= $(BUILD)/lib/btstack/src/classic/goep_client.o: CFLAGS += -Wno-error=format=
$(BUILD)/lib/btstack/src/ble/le_device_db_tlv.o: CFLAGS += -Wno-error=format= $(BUILD)/lib/btstack/src/ble/le_device_db_tlv.o: CFLAGS += -Wno-error=format=
endif endif

2
extmod/nimble/nimble.mk
View File

@ -16,7 +16,7 @@ ifeq ($(MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY),0)
NIMBLE_LIB_DIR = lib/mynewt-nimble NIMBLE_LIB_DIR = lib/mynewt-nimble
SRC_LIB += $(addprefix $(NIMBLE_LIB_DIR)/, \ LIB_SRC_C += $(addprefix $(NIMBLE_LIB_DIR)/, \
$(addprefix ext/tinycrypt/src/, \ $(addprefix ext/tinycrypt/src/, \
aes_encrypt.c \ aes_encrypt.c \
cmac_mode.c \ cmac_mode.c \

22
ports/stm32/Makefile
View File

@ -141,7 +141,7 @@ endif
# Options for mpy-cross # Options for mpy-cross
MPY_CROSS_FLAGS += -march=armv7m MPY_CROSS_FLAGS += -march=armv7m
SRC_LIB = $(addprefix lib/,\ LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \ libc/string0.c \
mp-readline/readline.c \ mp-readline/readline.c \
netutils/netutils.c \ netutils/netutils.c \
@ -155,7 +155,7 @@ SRC_LIB = $(addprefix lib/,\
) )
ifeq ($(MICROPY_FLOAT_IMPL),double) ifeq ($(MICROPY_FLOAT_IMPL),double)
SRC_LIBM = $(addprefix lib/libm_dbl/,\ LIBM_SRC_C = $(addprefix lib/libm_dbl/,\
__cos.c \ __cos.c \
__expo2.c \ __expo2.c \
__fpclassify.c \ __fpclassify.c \
@ -199,12 +199,12 @@ SRC_LIBM = $(addprefix lib/libm_dbl/,\
trunc.c \ trunc.c \
) )
ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1) ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
SRC_LIBM += lib/libm_dbl/thumb_vfp_sqrt.c LIBM_SRC_C += lib/libm_dbl/thumb_vfp_sqrt.c
else else
SRC_LIBM += lib/libm_dbl/sqrt.c LIBM_SRC_C += lib/libm_dbl/sqrt.c
endif endif
else else
SRC_LIBM = $(addprefix lib/libm/,\ LIBM_SRC_C = $(addprefix lib/libm/,\
math.c \ math.c \
acoshf.c \ acoshf.c \
asinfacosf.c \ asinfacosf.c \
@ -233,17 +233,17 @@ SRC_LIBM = $(addprefix lib/libm/,\
wf_tgamma.c \ wf_tgamma.c \
) )
ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1) ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
SRC_LIBM += lib/libm/thumb_vfp_sqrtf.c LIBM_SRC_C += lib/libm/thumb_vfp_sqrtf.c
else else
SRC_LIBM += lib/libm/ef_sqrt.c LIBM_SRC_C += lib/libm/ef_sqrt.c
endif endif
endif endif
LIBM_O = $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o)) LIBM_O = $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
# Too many warnings in libm_dbl, disable for now. # Too many warnings in libm_dbl, disable for now.
ifeq ($(MICROPY_FLOAT_IMPL),double) ifeq ($(MICROPY_FLOAT_IMPL),double)
$(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS)) $(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
endif endif
EXTMOD_SRC_C = $(addprefix extmod/,\ EXTMOD_SRC_C = $(addprefix extmod/,\
@ -501,7 +501,7 @@ endif
OBJ = OBJ =
OBJ += $(PY_O) OBJ += $(PY_O)
OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
OBJ += $(LIBM_O) OBJ += $(LIBM_O)
OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
@ -639,7 +639,7 @@ GEN_CDCINF_FILE = $(HEADER_BUILD)/pybcdc.inf
GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h
# List of sources for qstr extraction # List of sources for qstr extraction
SRC_QSTR += $(SRC_C) $(SRC_MOD) $(SRC_LIB) $(EXTMOD_SRC_C) SRC_QSTR += $(SRC_C) $(SRC_MOD) $(LIB_SRC_C) $(EXTMOD_SRC_C)
# Append any auto-generated sources that are needed by sources listed in # Append any auto-generated sources that are needed by sources listed in
# SRC_QSTR # SRC_QSTR
SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER) SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER)

4
ports/stm32/mboot/Makefile
View File

@ -82,7 +82,7 @@ else
COPT += -Os -DNDEBUG COPT += -Os -DNDEBUG
endif endif
SRC_LIB = \ LIB_SRC_C = \
lib/libc/string0.c \ lib/libc/string0.c \
lib/oofatfs/ff.c \ lib/oofatfs/ff.c \
lib/oofatfs/ffunicode.c \ lib/oofatfs/ffunicode.c \
@ -127,7 +127,7 @@ SRC_USBDEV = $(addprefix ports/stm32/$(USBDEV_DIR)/,\
) )
OBJ = OBJ =
OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.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))
OBJ += $(addprefix $(BUILD)/, $(SRC_HAL:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_HAL:.c=.o))