more board shrinking, and fix STATIC from merge

dhalbert · dhalbert · commit f8de84b7d3bf · 2024-09-14T10:57:39.000-04:00
diff --git a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "MX25L51245G","GD25S512MD"
 LONGINT_IMPL = MPZ
+
+RAINBOWIO = 0
diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -10,7 +10,6 @@ INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
 # Turn off to make fit.
-CIRCUTPY_PIXELBUF = 0
 CIRCUITPY_AESIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOCORE = 0
@@ -25,13 +24,15 @@ CIRCUITPY_PIXELMAP = 0
 CIRCUITPY_GETPASS = 0
 CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0
+CIRCUTPY_PIXELBUF = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_RAINBOWIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
+CIRCUITPY_WARNINGS = 0
 
 CIRCUITPY_ULAB = 0
 
diff --git a/ports/espressif/boards/seeed_xiao_esp32_s3_sense/pins.c b/ports/espressif/boards/seeed_xiao_esp32_s3_sense/pins.c
@@ -29,7 +29,7 @@ static const mp_rom_obj_tuple_t camera_data_tuple = {
     }
 };
 
-STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+static const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO2) },
diff --git a/ports/nordic/boards/bluemicro833/mpconfigboard.mk b/ports/nordic/boards/bluemicro833/mpconfigboard.mk
@@ -12,6 +12,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_AUDIOMIXER = 0
 CIRCUITPY_KEYPAD = 1
+CIRCUITPY_KEYPAD_DEMUX = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_PIXELBUF = 1

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ static const mp_rom_obj_tuple_t camera_data_tuple = {`
`29`	`29`	`}`
`30`	`30`	`};`
`31`	`31`
`32`		`-STATIC const mp_rom_map_elem_t board_module_globals_table[] = {`
	`32`	`+static const mp_rom_map_elem_t board_module_globals_table[] = {`
`33`	`33`	`CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS`
`34`	`34`	`{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO1) },`
`35`	`35`	`{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO2) },`