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

Merge pull request #2197 from hierophect/always-build-modules

Browse Source 
Sort some modules into ALWAYS-BUILD in mpconfig
This commit is contained in:
hierophect 2019-10-07 09:09:28 -04:00 committed by GitHub
commit 59ed879c8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/stm32f4/mpconfigport.mk
View File

@ -20,10 +20,7 @@ CIRCUITPY_DIGITALIO = 1
CIRCUITPY_ANALOGIO = 1 CIRCUITPY_ANALOGIO = 1
CIRCUITPY_MICROCONTROLLER = 1 CIRCUITPY_MICROCONTROLLER = 1
CIRCUITPY_BUSIO = 1 CIRCUITPY_BUSIO = 1
CIRCUITPY_TIME = 1
CIRCUITPY_OS = 1 CIRCUITPY_OS = 1
CIRCUITPY_STRUCT = 1
CIRCUITPY_MATH = 1
#ifeq ($(MCU_SUB_VARIANT), stm32f412zx) #ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
#endif #endif

13
py/circuitpy_mpconfig.mk
View File

@ -52,6 +52,11 @@ ifndef CIRCUITPY_DEFAULT_BUILD
endif endif
endif endif
# Some features have no unique HAL component, and thus there's never
# a reason to not include them.
ifndef CIRCUITPY_ALWAYS_BUILD
CIRCUITPY_ALWAYS_BUILD = 1
endif
# All builtin modules are listed below, with default values (0 for off, 1 for on) # All builtin modules are listed below, with default values (0 for off, 1 for on)
@ -151,7 +156,7 @@ endif
CFLAGS += -DCIRCUITPY_I2CSLAVE=$(CIRCUITPY_I2CSLAVE) CFLAGS += -DCIRCUITPY_I2CSLAVE=$(CIRCUITPY_I2CSLAVE)
ifndef CIRCUITPY_MATH ifndef CIRCUITPY_MATH
CIRCUITPY_MATH = $(CIRCUITPY_DEFAULT_BUILD) CIRCUITPY_MATH = $(CIRCUITPY_ALWAYS_BUILD)
endif endif
CFLAGS += -DCIRCUITPY_MATH=$(CIRCUITPY_MATH) CFLAGS += -DCIRCUITPY_MATH=$(CIRCUITPY_MATH)
@ -232,17 +237,17 @@ endif
CFLAGS += -DCIRCUITPY_STORAGE=$(CIRCUITPY_STORAGE) CFLAGS += -DCIRCUITPY_STORAGE=$(CIRCUITPY_STORAGE)
ifndef CIRCUITPY_STRUCT ifndef CIRCUITPY_STRUCT
CIRCUITPY_STRUCT = $(CIRCUITPY_DEFAULT_BUILD) CIRCUITPY_STRUCT = $(CIRCUITPY_ALWAYS_BUILD)
endif endif
CFLAGS += -DCIRCUITPY_STRUCT=$(CIRCUITPY_STRUCT) CFLAGS += -DCIRCUITPY_STRUCT=$(CIRCUITPY_STRUCT)
ifndef CIRCUITPY_SUPERVISOR ifndef CIRCUITPY_SUPERVISOR
CIRCUITPY_SUPERVISOR = $(CIRCUITPY_DEFAULT_BUILD) CIRCUITPY_SUPERVISOR = $(CIRCUITPY_ALWAYS_BUILD)
endif endif
CFLAGS += -DCIRCUITPY_SUPERVISOR=$(CIRCUITPY_SUPERVISOR) CFLAGS += -DCIRCUITPY_SUPERVISOR=$(CIRCUITPY_SUPERVISOR)
ifndef CIRCUITPY_TIME ifndef CIRCUITPY_TIME
CIRCUITPY_TIME = $(CIRCUITPY_DEFAULT_BUILD) CIRCUITPY_TIME = $(CIRCUITPY_ALWAYS_BUILD)
endif endif
CFLAGS += -DCIRCUITPY_TIME=$(CIRCUITPY_TIME) CFLAGS += -DCIRCUITPY_TIME=$(CIRCUITPY_TIME)