Skip to content

Commit 8791ca6

Browse files
committed
implement requested changes
1 parent d0a2106 commit 8791ca6

File tree

41 files changed

+57
-60
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+57
-60
lines changed

docs/porting.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ as a natural "TODO" list. An example minimal build list is shown below:
5050

5151
.. code-block:: makefile
5252
53-
# Items requiring ports/<port>/common-hal implementation:
53+
# These modules are implemented in ports/<port>/common-hal:
5454
CIRCUITPY_MICROCONTROLLER = 0 # Typically the first module to create
5555
CIRCUITPY_DIGITALIO = 0 # Typically the second module to create
5656
CIRCUITPY_ANALOGIO = 0
@@ -67,10 +67,11 @@ as a natural "TODO" list. An example minimal build list is shown below:
6767
CIRCUITPY_I2CSLAVE = 0
6868
CIRCUITPY_DISPLAYIO = 0 # Requires SPI, PulseIO (stub ok)
6969
70-
# Modules with no common-hal implementation, but depend on something else
70+
# These modules are implemented in shared-module/ - they can be included in
71+
# any port once their prerequisites in common-hal are complete.
7172
CIRCUITPY_BITBANGIO = 0 # Requires DigitalIO
7273
CIRCUITPY_GAMEPAD = 0 # Requires DigitalIO
73-
CIRCUITPY_PIXELBUF = 0 # Does nothing without a neopixel or dotstar
74+
CIRCUITPY_PIXELBUF = 0 # Requires neopixel_write or SPI (dotstar)
7475
CIRCUITPY_RANDOM = 0 # Requires OS
7576
CIRCUITPY_STORAGE = 0 # Requires OS, filesystem
7677
CIRCUITPY_TOUCHIO = 0 # Requires Microcontroller

docs/shared_bindings_matrix.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ def get_excluded_boards(base):
139139
re_board_chip = re.compile("CHIP_FAMILY\s=\s(\w+)")
140140
chip_keyword = "CHIP_FAMILY"
141141
elif port in ["nrf"]:
142-
re_board_chip = re.compile("MCU_VARIANT\s=\s(\w+)")
142+
re_board_chip = re.compile(r"MCU_VARIANT\s=\s(\w+)")
143143
elif port in ["stm"]:
144-
re_board_chip = re.compile("MCU_SERIES\s*=\s*(\w+)")
144+
re_board_chip = re.compile(r"MCU_SERIES\s*=\s*(\w+)")
145145
chip_keyword = "MCU_SERIES"
146146

147147
port_dir = "ports/{}".format(port)
@@ -175,9 +175,9 @@ def get_excluded_boards(base):
175175
check_dependent_modules = dict()
176176
for module in modules:
177177
board_is_excluded = False
178-
# check if board uses `SMALL_BUILD`. if yes, and current
178+
# check if board turns off `FULL_BUILD`. if yes, and current
179179
# module is marked as `FULL_BUILD`, board is excluded
180-
small_build = re.search("CIRCUITPY_SMALL_BUILD = 1", contents)
180+
small_build = re.search("CIRCUITPY_FULL_BUILD = 0", contents)
181181
if small_build and base[module]["full_build"] == "1":
182182
board_is_excluded = True
183183

ports/atmel-samd/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ else
114114

115115
# Do a default shrink for small builds.
116116
ifndef CFLAGS_INLINE_LIMIT
117-
ifeq ($(CIRCUITPY_SMALL_BUILD),1)
117+
ifeq ($(CIRCUITPY_FULL_BUILD),0)
118118
CFLAGS_INLINE_LIMIT = 50
119119
endif
120120
endif
@@ -125,7 +125,7 @@ else
125125

126126
CFLAGS += -flto -flto-partition=none
127127

128-
ifeq ($(CIRCUITPY_SMALL_BUILD),1)
128+
ifeq ($(CIRCUITPY_FULL_BUILD),0)
129129
CFLAGS += --param inline-unit-growth=15 --param max-inline-insns-auto=20
130130
endif
131131

ports/atmel-samd/boards/8086_commander/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
1313
EXTERNAL_FLASH_DEVICES = "W25Q128JV_SQ"
1414

1515
LONGINT_IMPL = NONE
16-
CIRCUITPY_SMALL_BUILD = 1
16+
CIRCUITPY_FULL_BUILD = 0
1717

1818
SUPEROPT_GC = 0
1919

ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212
SUPEROPT_GC = 0

ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0

ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0

ports/atmel-samd/boards/datum_distance/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/datum_imu/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/datum_light/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/datum_weather/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/escornabot_makech/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/meowmeow/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/ndgarage_ndbit6/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CHIP_FAMILY = samd21
99

1010
INTERNAL_FLASH_FILESYSTEM = 1
1111
LONGINT_IMPL = NONE
12-
CIRCUITPY_SMALL_BUILD = 1
12+
CIRCUITPY_FULL_BUILD = 0
1313

1414
SUPEROPT_GC = 0
1515

ports/atmel-samd/boards/nfc_copy_cat/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
1111
EXTERNAL_FLASH_DEVICES = "GD25Q16C"
1212
LONGINT_IMPL = NONE
1313

14-
CIRCUITPY_SMALL_BUILD = 1
14+
CIRCUITPY_FULL_BUILD = 0

ports/atmel-samd/boards/pewpew10/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
CIRCUITPY_PEW = 1
1414
CIRCUITPY_ANALOGIO = 1

ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CHIP_FAMILY = samd51
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111

12-
CIRCUITPY_SMALL_BUILD = 1
12+
CIRCUITPY_FULL_BUILD = 0
1313
# TODO: Turn off analogio for now for space reasons, but restore it
1414
# when frozen module gets smaller.
1515
CIRCUITPY_ANALOGIO = 0

ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CIRCUITPY_RTC = 0
2020
CIRCUITPY_SAMD = 0
2121
CIRCUITPY_USB_MIDI = 1
2222
CIRCUITPY_TOUCHIO = 0
23-
CIRCUITPY_SMALL_BUILD = 1
23+
CIRCUITPY_FULL_BUILD = 0
2424
# Make more room.
2525
SUPEROPT_GC = 0
2626

ports/atmel-samd/boards/pyruler/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
1414

ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/shirtty/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212
CIRCUITPY_I2CSLAVE = 1
1313
CIRCUITPY_TOUCHIO = 0
1414

ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ CHIP_FAMILY = samd21
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111

12-
CIRCUITPY_SMALL_BUILD = 1
12+
CIRCUITPY_FULL_BUILD = 0
1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
1111
EXTERNAL_FLASH_DEVICES = "W25Q32FV"
1212
LONGINT_IMPL = MPZ
1313

14-
CIRCUITPY_SMALL_BUILD = 1
14+
CIRCUITPY_FULL_BUILD = 0
1515
SUPEROPT_GC = 0

ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0

ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
1414

ports/atmel-samd/boards/uchip/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11-
CIRCUITPY_SMALL_BUILD = 1
11+
CIRCUITPY_FULL_BUILD = 0

ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CHIP_FAMILY = samd21
99

1010
INTERNAL_FLASH_FILESYSTEM = 1
1111
LONGINT_IMPL = MPZ
12-
CIRCUITPY_SMALL_BUILD = 1
12+
CIRCUITPY_FULL_BUILD = 0
1313

1414
SUPEROPT_GC = 0
1515

ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CHIP_FAMILY = samd21
99

1010
INTERNAL_FLASH_FILESYSTEM = 1
1111
LONGINT_IMPL = MPZ
12-
CIRCUITPY_SMALL_BUILD = 1
12+
CIRCUITPY_FULL_BUILD = 0
1313

1414
SUPEROPT_GC = 0
1515

ports/atmel-samd/mpconfigport.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@ CIRCUITPY_SAMD = 1
6565
endif
6666

6767
ifndef CIRCUITPY_ULAB
68-
ifneq ($(CIRCUITPY_SMALL_BUILD),1)
68+
ifneq ($(CIRCUITPY_FULL_BUILD),0)
6969
CIRCUITPY_ULAB = 1
7070
endif
7171
endif
7272

7373
ifndef CIRCUITPY_PROTOMATTER
74-
ifneq ($(CIRCUITPY_SMALL_BUILD),1)
74+
ifneq ($(CIRCUITPY_FULL_BUILD),0)
7575
CIRCUITPY_PROTOMATTER = 1
7676
endif
7777
endif
7878

7979
ifndef CIRCUITPY_FRAMEBUFFERIO
80-
ifneq ($(CIRCUITPY_SMALL_BUILD),1)
80+
ifneq ($(CIRCUITPY_FULL_BUILD),0)
8181
CIRCUITPY_FRAMEBUFFERIO = 1
8282
endif
8383
endif

0 commit comments

Comments
 (0)