Shrink nrf52833 builds

Make them CIRCUITPY_FULL_BUILD = 0 and rework the boards to have
the same modules enabled (ish.)

Also make ZLIB require FULL_BUILD and disable advanced `micropython`
module APIs by default on all builds.

Author: tannewt

ports/nrf/boards/bluemicro833/mpconfigboard.mk

@@ -7,41 +7,10 @@ MCU_CHIP = nrf52833
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
-CIRCUITPY_AESIO = 0
-CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOBUSIO = 0
-#CIRCUITPY_AUDIOCORE = 0
-#CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOMIXER = 0
-CIRCUITPY_AUDIOMP3 = 0
-CIRCUITPY_BINASCII = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_BUILTINS_POW3=0
-CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_JSON = 0
 CIRCUITPY_KEYPAD = 1
-CIRCUITPY_MSGPACK = 0
-#CIRCUITPY_NEOPIXEL_WRITE = 1
-CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_NVM = 0
+CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_PIXELBUF  = 1
-CIRCUITPY_PULSEIO  = 1
-CIRCUITPY_RE = 0
-CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_SDCARDIO = 0
-CIRCUITPY_SYNTHIO = 0
-CIRCUITPY_TRACEBACK = 0
 CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_TRACEBACK = 0
-CIRCUITPY_ULAB = 0
-CIRCUITPY_USB_MIDI = 0
-CIRCUITPY_VECTORIO = 0
-CIRCUITPY_ZLIB = 0
-
-MICROPY_PY_ASYNC_AWAIT = 0

ports/nrf/boards/microbit_v2/mpconfigboard.mk

@@ -5,26 +5,5 @@ MCU_CHIP = nrf52833
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
-CIRCUITPY_ALARM = 0
-CIRCUITPY_AUDIOMP3 = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BUILTINS_POW3=0
-CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_JSON = 0
-CIRCUITPY_KEYPAD = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_NEOPIXEL_WRITE = 0
-CIRCUITPY_NVM = 0
-CIRCUITPY_PIXELBUF  = 0
-CIRCUITPY_RE = 0
-CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_SDCARDIO = 0
-CIRCUITPY_ULAB = 0
+# USB pins aren't used.
 CIRCUITPY_USB = 0
-
-MICROPY_PY_ASYNC_AWAIT = 0

ports/nrf/boards/pca10100/mpconfigboard.mk

@@ -6,32 +6,3 @@ USB_MANUFACTURER = "Nordic Semiconductor"
 MCU_CHIP = nrf52833
 
 INTERNAL_FLASH_FILESYSTEM = 1
-
-CIRCUITPY_AESIO = 0
-CIRCUITPY_ALARM = 0
-CIRCUITPY_AUDIOMP3 = 0
-CIRCUITPY_BINASCII = 0
-CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_JSON = 0
-CIRCUITPY_KEYPAD = 0
-CIRCUITPY_MSGPACK = 0
-CIRCUITPY_NEOPIXEL_WRITE = 0
-CIRCUITPY_NVM = 0
-CIRCUITPY_PIXELBUF  = 0
-CIRCUITPY_RE = 0
-CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_SDCARDIO = 0
-CIRCUITPY_SYNTHIO = 0
-CIRCUITPY_ULAB = 0
-CIRCUITPY_USB_MIDI = 0
-CIRCUITPY_VECTORIO = 0
-CIRCUITPY_ZLIB = 0
-
-MICROPY_PY_ASYNC_AWAIT = 0

ports/nrf/boards/simmel/mpconfigboard.mk

@@ -13,36 +13,18 @@ INTERNAL_FLASH_FILESYSTEM = 1
 CIRCUITPY_ALARM = 0
 CIRCUITPY_AESIO = 1
 CIRCUITPY_AUDIOMIXER = 0
-CIRCUITPY_AUDIOMP3 = 0
-CIRCUITPY_BITMAPTOOLS = 0
-CIRCUITPY_BUSDEVICE = 0
-CIRCUITPY_BUSIO = 1
-CIRCUITPY_COUNTIO = 0
-CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_ERRNO = 0
-CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_GETPASS = 0
-CIRCUITPY_KEYPAD = 0
-CIRCUITPY_MSGPACK = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_ONEWIREIO = 0
-CIRCUITPY_PIXELBUF  = 0
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_PWMIO = 1
 # Deliberately excluded for other reasons than code space, see #5534
 CIRCUITPY_RAINBOWIO = 0
-CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_RTC = 1
-CIRCUITPY_SDCARDIO = 0
-CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_ULAB = 0
 CIRCUITPY_USB_CDC = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_WATCHDOG = 1
-CIRCUITPY_ZLIB = 0
 
 # Enable micropython.native
 #CIRCUITPY_ENABLE_MPY_NATIVE = 1

ports/nrf/mpconfigport.mk

@@ -32,12 +32,7 @@ CIRCUITPY_RTC ?= 1
 # frequencyio not yet implemented
 CIRCUITPY_FREQUENCYIO = 0
 
-CIRCUITPY_RGBMATRIX ?= 1
 CIRCUITPY_ROTARYIO_SOFTENCODER = 1
-CIRCUITPY_FRAMEBUFFERIO ?= 1
-
-CIRCUITPY_COUNTIO ?= 1
-CIRCUITPY_WATCHDOG ?= 1
 
 # Sleep and Wakeup
 CIRCUITPY_ALARM ?= 1
@@ -60,6 +55,12 @@ MCU_SUB_VARIANT = nrf52840
 # Fits on nrf52840 but space is tight on nrf52833.
 CIRCUITPY_AESIO ?= 1
 
+CIRCUITPY_RGBMATRIX ?= 1
+CIRCUITPY_FRAMEBUFFERIO ?= 1
+
+CIRCUITPY_COUNTIO ?= 1
+CIRCUITPY_WATCHDOG ?= 1
+
 SD ?= s140
 SOFTDEV_VERSION ?= 6.1.0
 
@@ -87,6 +88,8 @@ MCU_SUB_VARIANT = nrf52833
 SUPEROPT_GC ?= 0
 SUPEROPT_VM ?= 0
 
+CIRCUITPY_SYNTHIO ?= 0
+
 SD ?= s140
 SOFTDEV_VERSION ?= 7.0.1
 
@@ -97,5 +100,9 @@ OPTIMIZATION_FLAGS ?= -Os
 
 CIRCUITPY_LTO = 1
 CIRCUITPY_LTO_PARTITION = one
+ifeq ($(INTERNAL_FLASH_FILESYSTEM),1)
+  CIRCUITPY_FULL_BUILD ?= 0
+  CIRCUITPY_PULSEIO ?= 1
+endif
 endif
 endif

py/circuitpy_mpconfig.h

@@ -230,7 +230,7 @@ typedef long mp_off_t;
 #define MICROPY_PY_URE_MATCH_SPAN_START_END   (CIRCUITPY_RE)
 #define MICROPY_PY_URE_SUB                    (CIRCUITPY_RE)
 
-#define CIRCUITPY_MICROPYTHON_ADVANCED        (CIRCUITPY_FULL_BUILD)
+#define CIRCUITPY_MICROPYTHON_ADVANCED        (0)
 
 #ifndef MICROPY_FATFS_EXFAT
 #define MICROPY_FATFS_EXFAT           (CIRCUITPY_FULL_BUILD)

py/circuitpy_mpconfig.mk

@@ -460,7 +460,7 @@ CIRCUITPY_USTACK ?= 0
 CFLAGS += -DCIRCUITPY_USTACK=$(CIRCUITPY_USTACK)
 
 # for decompressing utlities
-CIRCUITPY_ZLIB ?= 1
+CIRCUITPY_ZLIB ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ZLIB=$(CIRCUITPY_ZLIB)
 
 # ulab numerics library