support user-configuration files

bablokb · bablokb · commit b59a3e59706a · 2026-02-19T06:00:45.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -55,6 +55,9 @@ __pycache__/
 ######################
 GNUmakefile
 user.props
+mpconfiguser1.mk
+mpconfiguser2.mk
+user_defns.mk
 
 # Sphinx output
 ###############
diff --git a/py/circuitpy_mkenv.mk b/py/circuitpy_mkenv.mk
@@ -43,6 +43,10 @@ ifneq ($(VALID_BOARD),)
 include boards/$(BOARD)/mpconfigboard.mk
 endif
 
+# user-specific settings that mpconfigport does not override
+# (i.e. mpconfigport.mk uses "foo ?= bar")
+-include mpconfiguser1.mk
+
 # Port-specific
 include mpconfigport.mk
 
@@ -52,6 +56,10 @@ ifneq ($(VALID_BOARD),)
 include $(TOP)/py/circuitpy_mpconfig.mk
 endif
 
+# user-specific overrides of hard-coded settings
+# (i.e. xxx.mk uses "foo = bar")
+-include mpconfiguser2.mk
+
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h
 
@@ -62,3 +70,6 @@ include $(TOP)/supervisor/supervisor.mk
 
 # Include make rules and variables common across CircuitPython builds.
 include $(TOP)/py/circuitpy_defns.mk
+
+# user specific
+-include user_defns.mk
