diff --git a/docs/porting.rst b/docs/porting.rst
index 1fb9d13bc6..d28f56f475 100644
--- a/docs/porting.rst
+++ b/docs/porting.rst
@@ -50,7 +50,7 @@ as a natural "TODO" list. An example minimal build list is shown below:
 
 .. code-block:: makefile
 
-    # Items requiring ports/<port>/common-hal implementation:
+    # These modules are implemented in ports/<port>/common-hal:
     CIRCUITPY_MICROCONTROLLER = 0 # Typically the first module to create
     CIRCUITPY_DIGITALIO = 0       # Typically the second module to create
     CIRCUITPY_ANALOGIO = 0
@@ -67,10 +67,11 @@ as a natural "TODO" list. An example minimal build list is shown below:
     CIRCUITPY_I2CSLAVE = 0
     CIRCUITPY_DISPLAYIO = 0       # Requires SPI, PulseIO (stub ok)
 
-    # Modules with no common-hal implementation, but depend on something else
+    # These modules are implemented in shared-module/ - they can be included in
+    # any port once their prerequisites in common-hal are complete.
     CIRCUITPY_BITBANGIO = 0       # Requires DigitalIO
     CIRCUITPY_GAMEPAD = 0         # Requires DigitalIO
-    CIRCUITPY_PIXELBUF = 0        # Does nothing without a neopixel or dotstar
+    CIRCUITPY_PIXELBUF = 0        # Requires neopixel_write or SPI (dotstar)
     CIRCUITPY_RANDOM = 0          # Requires OS
     CIRCUITPY_STORAGE = 0         # Requires OS, filesystem
     CIRCUITPY_TOUCHIO = 0         # Requires Microcontroller
diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py
index 0473c5119a..d5f838f75b 100644
--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@@ -139,9 +139,9 @@ def get_excluded_boards(base):
             re_board_chip = re.compile("CHIP_FAMILY\s=\s(\w+)")
             chip_keyword = "CHIP_FAMILY"
         elif port in ["nrf"]:
-            re_board_chip = re.compile("MCU_VARIANT\s=\s(\w+)")
+            re_board_chip = re.compile(r"MCU_VARIANT\s=\s(\w+)")
         elif port in ["stm"]:
-            re_board_chip = re.compile("MCU_SERIES\s*=\s*(\w+)")
+            re_board_chip = re.compile(r"MCU_SERIES\s*=\s*(\w+)")
             chip_keyword = "MCU_SERIES"
 
         port_dir = "ports/{}".format(port)
@@ -175,9 +175,9 @@ def get_excluded_boards(base):
             check_dependent_modules = dict()
             for module in modules:
                 board_is_excluded = False
-                # check if board uses `SMALL_BUILD`. if yes, and current
+                # check if board turns off `FULL_BUILD`. if yes, and current
                 # module is marked as `FULL_BUILD`, board is excluded
-                small_build = re.search("CIRCUITPY_SMALL_BUILD = 1", contents)
+                small_build = re.search("CIRCUITPY_FULL_BUILD = 0", contents)
                 if small_build and base[module]["full_build"] == "1":
                     board_is_excluded = True
 
diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index f4886f96ef..7a626dff71 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -114,7 +114,7 @@ else
 
   # Do a default shrink for small builds.
   ifndef CFLAGS_INLINE_LIMIT
-    ifeq ($(CIRCUITPY_SMALL_BUILD),1)
+    ifeq ($(CIRCUITPY_FULL_BUILD),0)
       CFLAGS_INLINE_LIMIT = 50
     endif
   endif
@@ -125,7 +125,7 @@ else
 
   CFLAGS += -flto -flto-partition=none
 
-  ifeq ($(CIRCUITPY_SMALL_BUILD),1)
+  ifeq ($(CIRCUITPY_FULL_BUILD),0)
     CFLAGS += --param inline-unit-growth=15 --param max-inline-insns-auto=20
   endif
 
diff --git a/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk b/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
index 3e865657ac..dcc62fc9bc 100644
--- a/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
@@ -13,7 +13,7 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = "W25Q128JV_SQ"
 
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
 
diff --git a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
index bd682ade07..d31d1f54a4 100644
--- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
@@ -8,5 +8,5 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
index 894b9b0110..7eb83a1230 100644
--- a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
index 8a29b0ace0..fd24edafa2 100644
--- a/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
index f94ec13b7c..a5722c9ade 100644
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk b/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk
index c3f0750a9e..055e6b19e2 100644
--- a/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk
@@ -8,4 +8,4 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk b/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
index adae4beb27..8724e0d4bb 100644
--- a/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
@@ -8,4 +8,4 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/datum_distance/mpconfigboard.mk b/ports/atmel-samd/boards/datum_distance/mpconfigboard.mk
index 4f6c7ab82e..ae05d32f2c 100644
--- a/ports/atmel-samd/boards/datum_distance/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/datum_distance/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/datum_imu/mpconfigboard.mk b/ports/atmel-samd/boards/datum_imu/mpconfigboard.mk
index 336a1b832f..6fd05f403b 100644
--- a/ports/atmel-samd/boards/datum_imu/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/datum_imu/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/datum_light/mpconfigboard.mk b/ports/atmel-samd/boards/datum_light/mpconfigboard.mk
index 7ec2efcf96..d42a7869de 100644
--- a/ports/atmel-samd/boards/datum_light/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/datum_light/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/datum_weather/mpconfigboard.mk b/ports/atmel-samd/boards/datum_weather/mpconfigboard.mk
index d3ec1b0fdd..d92cbc71b3 100644
--- a/ports/atmel-samd/boards/datum_weather/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/datum_weather/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.mk b/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.mk
index dedd49ff71..93f6b1c90f 100644
--- a/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/escornabot_makech/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
index 134abf7236..54c5bff6a0 100644
--- a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
index 3643743509..69ebdfc237 100644
--- a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
index 40a461b279..7556b9517f 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
index 736161047a..de79638bd3 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk b/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
index d649386328..ca3eccbe4f 100644
--- a/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk b/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
index 4b452ecbfe..bd0afb60e2 100644
--- a/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/ndgarage_ndbit6/mpconfigboard.mk b/ports/atmel-samd/boards/ndgarage_ndbit6/mpconfigboard.mk
index b73f0951ee..5e5f0ff5fd 100644
--- a/ports/atmel-samd/boards/ndgarage_ndbit6/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ndgarage_ndbit6/mpconfigboard.mk
@@ -9,7 +9,7 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
 
diff --git a/ports/atmel-samd/boards/nfc_copy_cat/mpconfigboard.mk b/ports/atmel-samd/boards/nfc_copy_cat/mpconfigboard.mk
index 4f6d1e70d5..1b4a16a08d 100644
--- a/ports/atmel-samd/boards/nfc_copy_cat/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/nfc_copy_cat/mpconfigboard.mk
@@ -11,4 +11,4 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q16C"
 LONGINT_IMPL = NONE
 
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
index b3271d062f..7305abf73a 100644
--- a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
@@ -8,7 +8,7 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 CIRCUITPY_PEW = 1
 CIRCUITPY_ANALOGIO = 1
diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 51b4fc993c..f5b6ca3899 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -9,7 +9,7 @@ CHIP_FAMILY = samd51
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 # TODO: Turn off analogio for now for space reasons, but restore it
 # when frozen module gets smaller.
 CIRCUITPY_ANALOGIO = 0
diff --git a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
index e6c227b135..8b7066ac7a 100644
--- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
@@ -20,7 +20,7 @@ CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 1
 CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 # Make more room.
 SUPEROPT_GC = 0
 
diff --git a/ports/atmel-samd/boards/pyruler/mpconfigboard.mk b/ports/atmel-samd/boards/pyruler/mpconfigboard.mk
index ca7ed4bdc3..b799406732 100644
--- a/ports/atmel-samd/boards/pyruler/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pyruler/mpconfigboard.mk
@@ -8,7 +8,7 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
 
diff --git a/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk b/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk
index 2741454ce9..bedec87f45 100644
--- a/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/shirtty/mpconfigboard.mk b/ports/atmel-samd/boards/shirtty/mpconfigboard.mk
index bc37b59433..295ba4bce4 100644
--- a/ports/atmel-samd/boards/shirtty/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/shirtty/mpconfigboard.mk
@@ -8,7 +8,7 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 CIRCUITPY_I2CSLAVE = 1
 CIRCUITPY_TOUCHIO = 0
 
diff --git a/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/mpconfigboard.mk
index 632cd095c2..22e2059a93 100644
--- a/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/mpconfigboard.mk
@@ -9,5 +9,5 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/mpconfigboard.mk
index ccf5a41495..dd01c9985b 100644
--- a/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/mpconfigboard.mk
@@ -11,5 +11,5 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32FV"
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk
index 0c33ef960e..a2bd577cd3 100644
--- a/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
index d09785fb8a..9460d0009b 100644
--- a/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
index 5c942901a8..aab5efd5dc 100644
--- a/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
@@ -8,7 +8,7 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
 
diff --git a/ports/atmel-samd/boards/uchip/mpconfigboard.mk b/ports/atmel-samd/boards/uchip/mpconfigboard.mk
index 950910e48b..90b5600dcb 100644
--- a/ports/atmel-samd/boards/uchip/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/uchip/mpconfigboard.mk
@@ -8,4 +8,4 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
diff --git a/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk b/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk
index 941d88b459..fdcde4a07e 100644
--- a/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk
@@ -9,7 +9,7 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
 
diff --git a/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk b/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
index 5c418d312c..c1dbf514d7 100644
--- a/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
@@ -9,7 +9,7 @@ CHIP_FAMILY = samd21
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
-CIRCUITPY_SMALL_BUILD = 1
+CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
 
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index 61f7c206ab..d043ee242e 100644
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@@ -65,19 +65,19 @@ CIRCUITPY_SAMD = 1
 endif
 
 ifndef CIRCUITPY_ULAB
-ifneq ($(CIRCUITPY_SMALL_BUILD),1)
+ifneq ($(CIRCUITPY_FULL_BUILD),0)
 CIRCUITPY_ULAB = 1
 endif
 endif
 
 ifndef CIRCUITPY_PROTOMATTER
-ifneq ($(CIRCUITPY_SMALL_BUILD),1)
+ifneq ($(CIRCUITPY_FULL_BUILD),0)
 CIRCUITPY_PROTOMATTER = 1
 endif
 endif
 
 ifndef CIRCUITPY_FRAMEBUFFERIO
-ifneq ($(CIRCUITPY_SMALL_BUILD),1)
+ifneq ($(CIRCUITPY_FULL_BUILD),0)
 CIRCUITPY_FRAMEBUFFERIO = 1
 endif
 endif
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index 15254f9179..7ed2aa49a2 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -4,7 +4,7 @@ INTERNAL_LIBM = 1
 USB_SERIAL_NUMBER_LENGTH = 24
 
 ifeq ($(MCU_SERIES),F4)
-	# Items requiring common-hal implementation:
+	# Not yet implemented common-hal modules:
 	CIRCUITPY_AUDIOBUSIO = 0
 	CIRCUITPY_AUDIOIO = 0
 	CIRCUITPY_ROTARYIO = 0
@@ -18,7 +18,7 @@ ifeq ($(MCU_SERIES),F4)
 endif
 
 ifeq ($(MCU_SERIES),H7)
-	# Items requiring common-hal implementation:
+	# Not yet implemented common-hal modules:
 	CIRCUITPY_ANALOGIO = 0
 	CIRCUITPY_NEOPIXEL_WRITE = 0
 	CIRCUITPY_PULSEIO = 0
@@ -30,14 +30,14 @@ ifeq ($(MCU_SERIES),H7)
 	CIRCUITPY_RTC = 0
 	CIRCUITPY_FREQUENCYIO = 0
 	CIRCUITPY_I2CSLAVE = 0
-	# Modules with no common-hal implementation that depend on something else
+	# shared-module modules that still need prerequisites filled
 	CIRCUITPY_DISPLAYIO = 0 # Requires SPI, PulseIO, and common-hal module (stub ok)
 	CIRCUITPY_RANDOM = 0	# Requires OS
 	CIRCUITPY_STORAGE = 0	# Requires OS, filesystem
 endif
 
 ifeq ($(MCU_SERIES),F7)
-	# Items requiring common-hal implementation:
+	# Not yet implemented common-hal modules:
 	CIRCUITPY_ANALOGIO = 0
 	CIRCUITPY_NEOPIXEL_WRITE = 0
 	CIRCUITPY_PULSEIO = 0
@@ -49,7 +49,7 @@ ifeq ($(MCU_SERIES),F7)
 	CIRCUITPY_RTC = 0
 	CIRCUITPY_FREQUENCYIO = 0
 	CIRCUITPY_I2CSLAVE = 0
-	# Modules with no common-hal implementation that depend on something else
+	# shared-module modules that still need prerequisites filled
 	CIRCUITPY_DISPLAYIO = 0 # Requires SPI, PulseIO, and common-hal module (stub ok)
 	CIRCUITPY_RANDOM = 0	# Requires OS
 	CIRCUITPY_STORAGE = 0	# Requires OS, filesystem
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 89e9396dda..e09a6309f1 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -179,8 +179,7 @@ typedef long mp_off_t;
 // board-specific definitions, which control and may override definitions below.
 #include "mpconfigboard.h"
 
-// CIRCUITPY_FULL_BUILD is defined in py/circuitpy_mpconfig.mk
-// 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)
 #define MICROPY_CPYTHON_COMPAT                (CIRCUITPY_FULL_BUILD)
 #define MICROPY_COMP_FSTRING_LITERAL          (MICROPY_CPYTHON_COMPAT)
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 1c2afc33e7..61dd9e6dab 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -26,18 +26,15 @@
 # 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. Avoid using this for incomplete ports, as it changes
-# settings in other files.
+# 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)
 
+
 ifndef CIRCUITPY_ANALOGIO
 CIRCUITPY_ANALOGIO = 1
 endif