Merge remote-tracking branch 'adafruit/master' into lower_power

2 files changed, 29 insertions, 70 deletions

diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 497fd9523..29a4d524c 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -179,17 +179,10 @@ typedef long mp_off_t;
 // board-specific definitions, which control and may override definitions below.
 #include "mpconfigboard.h"
 
-// CIRCUITPY_FULL_BUILD is defined in a *.mk file.
-
-// Remove some lesser-used functionality to make small builds fit.
+// Turning off FULL_BUILD removes some functionality to reduce flash size on tiny SAMD21s
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (CIRCUITPY_FULL_BUILD)
-//TODO: replace this with a rework of the FULL_BUILD system
-#if !defined(MICROPY_CPYTHON_COMPAT)
-	#define MICROPY_CPYTHON_COMPAT                (CIRCUITPY_FULL_BUILD)
-#endif
-#if !defined(MICROPY_COMP_FSTRING_LITERAL)
+#define MICROPY_CPYTHON_COMPAT                (CIRCUITPY_FULL_BUILD)
 #define MICROPY_COMP_FSTRING_LITERAL          (MICROPY_CPYTHON_COMPAT)
-#endif
 #define MICROPY_MODULE_WEAK_LINKS             (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_ALL_SPECIAL_METHODS        (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_BUILTINS_COMPLEX           (CIRCUITPY_FULL_BUILD)
@@ -223,7 +216,7 @@ typedef long mp_off_t;
 #define MP_SSIZE_MAX (0x7fffffff)
 #endif
 
-#if INTERNAL_FLASH_FILESYSTEM == 0 && QSPI_FLASH_FILESYSTEM == 0 && SPI_FLASH_FILESYSTEM == 0 && !CIRCUITPY_MINIMAL_BUILD
+#if INTERNAL_FLASH_FILESYSTEM == 0 && QSPI_FLASH_FILESYSTEM == 0 && SPI_FLASH_FILESYSTEM == 0 && !DISABLE_FILESYSTEM
 #error No *_FLASH_FILESYSTEM set!
 #endif
 
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 601f1c4e4..30ab720d7 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -23,54 +23,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# mpconfigboard.mk files can specify:
-# CIRCUITPY_FULL_BUILD = 1 (which is the default)
-# or
-# CIRCUITPY_SMALL_BUILD = 1
-# which is the same as:
-# CIRCUITPY_FULL_BUILD = 0
+# Boards default to all modules enabled (with exceptions)
+# Manually disable by overriding in #mpconfigboard.mk
 
+# Smaller builds can be forced for resource constrained chips (typically SAMD21s
+# without external flash) by setting CIRCUITPY_FULL_BUILD=0. Avoid using this 
+# for merely incomplete ports, as it changes settings in other files.
 ifndef CIRCUITPY_FULL_BUILD
-  ifeq ($(CIRCUITPY_SMALL_BUILD),1)
-    CIRCUITPY_FULL_BUILD = 0
-  else
     CIRCUITPY_FULL_BUILD = 1
-  endif
 endif
 CFLAGS += -DCIRCUITPY_FULL_BUILD=$(CIRCUITPY_FULL_BUILD)
 
-# Setting CIRCUITPY_MINIMAL_BUILD = 1 will disable all features
-# Use for for early stage or highly restricted ports
-ifndef CIRCUITPY_MINIMAL_BUILD
-CIRCUITPY_MINIMAL_BUILD = 0
-endif
-CFLAGS += -DCIRCUITPY_MINIMAL_BUILD=$(CIRCUITPY_MINIMAL_BUILD)
-
-ifndef CIRCUITPY_DEFAULT_BUILD
-  ifeq ($(CIRCUITPY_MINIMAL_BUILD),1)
-        CIRCUITPY_FULL_BUILD = 0
-        CIRCUITPY_DEFAULT_BUILD = 0
-  else
-        CIRCUITPY_DEFAULT_BUILD = 1
-  endif
-endif
-CFLAGS += -DCIRCUITPY_DEFAULT_BUILD=$(CIRCUITPY_DEFAULT_BUILD)
-
-# 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
-CFLAGS += -DCIRCUITPY_ALWAYS_BUILD=$(CIRCUITPY_ALWAYS_BUILD)
-
-
-# All builtin modules are listed below, with default values (0 for off, 1 for on)
-# Some are always on, some are always off, and some depend on CIRCUITPY_FULL_BUILD.
-#
-# *** You can override any of the defaults by defining them in your mpconfigboard.mk.
 
 ifndef CIRCUITPY_ANALOGIO
-CIRCUITPY_ANALOGIO = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_ANALOGIO = 1
 endif
 CFLAGS += -DCIRCUITPY_ANALOGIO=$(CIRCUITPY_ANALOGIO)
 
@@ -89,7 +55,6 @@ CIRCUITPY_AUDIOIO_COMPAT = $(CIRCUITPY_AUDIOIO)
 endif
 CFLAGS += -DCIRCUITPY_AUDIOIO_COMPAT=$(CIRCUITPY_AUDIOIO_COMPAT)
 
-
 ifndef CIRCUITPY_AUDIOPWMIO
 CIRCUITPY_AUDIOPWMIO = 0
 endif
@@ -130,17 +95,17 @@ endif
 CFLAGS += -DCIRCUITPY_BLEIO=$(CIRCUITPY_BLEIO)
 
 ifndef CIRCUITPY_BOARD
-CIRCUITPY_BOARD = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_BOARD = 1
 endif
 CFLAGS += -DCIRCUITPY_BOARD=$(CIRCUITPY_BOARD)
 
 ifndef CIRCUITPY_BUSIO
-CIRCUITPY_BUSIO = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_BUSIO = 1
 endif
 CFLAGS += -DCIRCUITPY_BUSIO=$(CIRCUITPY_BUSIO)
 
 ifndef CIRCUITPY_DIGITALIO
-CIRCUITPY_DIGITALIO = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_DIGITALIO = 1
 endif
 CFLAGS += -DCIRCUITPY_DIGITALIO=$(CIRCUITPY_DIGITALIO)
 
@@ -175,7 +140,7 @@ endif
 CFLAGS += -DCIRCUITPY_I2CSLAVE=$(CIRCUITPY_I2CSLAVE)
 
 ifndef CIRCUITPY_MATH
-CIRCUITPY_MATH = $(CIRCUITPY_ALWAYS_BUILD)
+CIRCUITPY_MATH = 1
 endif
 CFLAGS += -DCIRCUITPY_MATH=$(CIRCUITPY_MATH)
 
@@ -185,12 +150,12 @@ endif
 CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
 
 ifndef CIRCUITPY_MICROCONTROLLER
-CIRCUITPY_MICROCONTROLLER = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_MICROCONTROLLER = 1
 endif
 CFLAGS += -DCIRCUITPY_MICROCONTROLLER=$(CIRCUITPY_MICROCONTROLLER)
 
 ifndef CIRCUITPY_NEOPIXEL_WRITE
-CIRCUITPY_NEOPIXEL_WRITE = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_NEOPIXEL_WRITE = 1
 endif
 CFLAGS += -DCIRCUITPY_NEOPIXEL_WRITE=$(CIRCUITPY_NEOPIXEL_WRITE)
 
@@ -201,12 +166,12 @@ endif
 CFLAGS += -DCIRCUITPY_NETWORK=$(CIRCUITPY_NETWORK)
 
 ifndef CIRCUITPY_NVM
-CIRCUITPY_NVM = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_NVM = 1
 endif
 CFLAGS += -DCIRCUITPY_NVM=$(CIRCUITPY_NVM)
 
 ifndef CIRCUITPY_OS
-CIRCUITPY_OS = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_OS = 1
 endif
 CFLAGS += -DCIRCUITPY_OS=$(CIRCUITPY_OS)
 
@@ -222,7 +187,7 @@ endif
 CFLAGS += -DCIRCUITPY_RGBMATRIX=$(CIRCUITPY_RGBMATRIX)
 
 ifndef CIRCUITPY_PULSEIO
-CIRCUITPY_PULSEIO = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_PULSEIO = 1
 endif
 CFLAGS += -DCIRCUITPY_PULSEIO=$(CIRCUITPY_PULSEIO)
 
@@ -233,17 +198,17 @@ endif
 CFLAGS += -DCIRCUITPY_PS2IO=$(CIRCUITPY_PS2IO)
 
 ifndef CIRCUITPY_RANDOM
-CIRCUITPY_RANDOM = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_RANDOM = 1
 endif
 CFLAGS += -DCIRCUITPY_RANDOM=$(CIRCUITPY_RANDOM)
 
 ifndef CIRCUITPY_ROTARYIO
-CIRCUITPY_ROTARYIO = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_ROTARYIO = 1
 endif
 CFLAGS += -DCIRCUITPY_ROTARYIO=$(CIRCUITPY_ROTARYIO)
 
 ifndef CIRCUITPY_RTC
-CIRCUITPY_RTC = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_RTC = 1
 endif
 CFLAGS += -DCIRCUITPY_RTC=$(CIRCUITPY_RTC)
 
@@ -262,22 +227,22 @@ endif
 CFLAGS += -DCIRCUITPY_STAGE=$(CIRCUITPY_STAGE)
 
 ifndef CIRCUITPY_STORAGE
-CIRCUITPY_STORAGE = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_STORAGE = 1
 endif
 CFLAGS += -DCIRCUITPY_STORAGE=$(CIRCUITPY_STORAGE)
 
 ifndef CIRCUITPY_STRUCT
-CIRCUITPY_STRUCT = $(CIRCUITPY_ALWAYS_BUILD)
+CIRCUITPY_STRUCT = 1
 endif
 CFLAGS += -DCIRCUITPY_STRUCT=$(CIRCUITPY_STRUCT)
 
 ifndef CIRCUITPY_SUPERVISOR
-CIRCUITPY_SUPERVISOR = $(CIRCUITPY_ALWAYS_BUILD)
+CIRCUITPY_SUPERVISOR = 1
 endif
 CFLAGS += -DCIRCUITPY_SUPERVISOR=$(CIRCUITPY_SUPERVISOR)
 
 ifndef CIRCUITPY_TIME
-CIRCUITPY_TIME = $(CIRCUITPY_ALWAYS_BUILD)
+CIRCUITPY_TIME = 1
 endif
 CFLAGS += -DCIRCUITPY_TIME=$(CIRCUITPY_TIME)
 
@@ -288,7 +253,7 @@ endif
 CFLAGS += -DCIRCUITPY_TOUCHIO_USE_NATIVE=$(CIRCUITPY_TOUCHIO_USE_NATIVE)
 
 ifndef CIRCUITPY_TOUCHIO
-CIRCUITPY_TOUCHIO = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_TOUCHIO = 1
 endif
 CFLAGS += -DCIRCUITPY_TOUCHIO=$(CIRCUITPY_TOUCHIO)
 
@@ -299,12 +264,12 @@ endif
 CFLAGS += -DCIRCUITPY_UHEAP=$(CIRCUITPY_UHEAP)
 
 ifndef CIRCUITPY_USB_HID
-CIRCUITPY_USB_HID = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_USB_HID = 1
 endif
 CFLAGS += -DCIRCUITPY_USB_HID=$(CIRCUITPY_USB_HID)
 
 ifndef CIRCUITPY_USB_MIDI
-CIRCUITPY_USB_MIDI = $(CIRCUITPY_DEFAULT_BUILD)
+CIRCUITPY_USB_MIDI = 1
 endif
 CFLAGS += -DCIRCUITPY_USB_MIDI=$(CIRCUITPY_USB_MIDI)
 
@@ -354,6 +319,7 @@ CFLAGS += -DCIRCUITPY_SERIAL_UART=$(CIRCUITPY_SERIAL_UART)
 ifndef CIRCUITPY_ULAB
 CIRCUITPY_ULAB = $(CIRCUITPY_FULL_BUILD)
 endif
+CFLAGS += -DCIRCUITPY_ULAB=$(CIRCUITPY_ULAB)
 
 # Enabled micropython.native decorator (experimental)
 ifndef CIRCUITPY_ENABLE_MPY_NATIVE