8000 Merge pull request #4248 from dhalbert/uniform-build-shrinks · russbot/circuitpython@8b626a4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8b626a4

Browse files
tannewttannewt
authored
Merge pull request adafruit#4248 from dhalbert/uniform-build-shrinks
set SUPEROPT_VM = 0 on most non-Express SAMD21 boards
2 parents 137a995 + a30d4ad commit 8b626a4

File tree

31 files changed

+27
-128
lines changed

31 files changed

+27
-128
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ CIRCUITPY_FULL_BUILD = 0
1515
CIRCUITPY_USB_MIDI = 0
1616

1717
SUPEROPT_GC = 0
18-
19-
CFLAGS_INLINE_LIMIT = 60
18+
SUPEROPT_VM = 0
2019

2120
CIRCUITPY_GAMEPAD = 1
2221
CIRCUITPY_BUSDEVICE = 1

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ CHIP_FAMILY = samd21
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
12+
1213
SUPEROPT_GC = 0
1314
SUPEROPT_VM = 0

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
1414
SUPEROPT_VM = 0
15-
CFLAGS_INLINE_LIMIT = 40

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14-
15-
CFLAGS_BOARD = --param max-inline-insns-auto=15
14+
SUPEROPT_VM = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14+
SUPEROPT_VM = 0

‎ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CIRCUITPY_ROTARYIO = 0
2222
CIRCUITPY_RTC = 0
2323

2424
SUPEROPT_GC = 0
25-
CFLAGS_INLINE_LIMIT = 40
25+
SUPEROPT_VM = 0
2626

2727

2828
# Include these Python libraries in firmware.

‎ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,10 @@ CIRCUITPY_RTC = 0
2525
CIRCUITPY_VECTORIO = 0
2626

2727
SUPEROPT_GC = 0
28-
CFLAGS_INLINE_LIMIT = 55
28+
SUPEROPT_VM = 0
2929

3030
# Include these Python libraries in firmware.
3131
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
3232
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
3333
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
3434
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor
35-
36-
CFLAGS_BOARD = --param max-inline-insns-auto=15
37-
ifeq ($(TRANSLATION), ja)
38-
RELEASE_NEEDS_CLEAN_BUILD = 1
39-
CFLAGS_INLINE_LIMIT = 15
40-
endif
41-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
42-
RELEASE_NEEDS_CLEAN_BUILD = 1
43-
CFLAGS_INLINE_LIMIT = 35
44-
endif
45-
ifeq ($(TRANSLATION), de_DE)
46-
RELEASE_NEEDS_CLEAN_BUILD = 1
47-
CFLAGS_INLINE_LIMIT = 35
48-
SUPEROPT_VM = 0
49-
endif

‎ports/atmel-samd/boards/cp_sapling_m0/mpconfigboard.mk

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14-
15-
CFLAGS_BOARD = --param max-inline-insns-auto=15
16-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
17-
RELEASE_NEEDS_CLEAN_BUILD = 1
18-
CFLAGS_INLINE_LIMIT = 35
19-
endif
20-
ifeq ($(TRANSLATION), de_DE)
21-
RELEASE_NEEDS_CLEAN_BUILD = 1
22-
CFLAGS_INLINE_LIMIT = 35
2314
SUPEROPT_VM = 0
24-
endif

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14+
SUPEROPT_VM = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14+
SUPEROPT_VM = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14+
SUPEROPT_VM = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14+
SUPEROPT_VM = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ CIRCUITPY_FULL_BUILD = 0
1212
CIRCUITPY_RTC = 0
1313

1414
SUPEROPT_GC = 0
15+
SUPEROPT_VM = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14+
SUPEROPT_VM = 0

‎ports/atmel-samd/boards/fluff_m0/mpconfigboard.mk

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14-
15-
CFLAGS_BOARD = --param max-inline-insns-auto=15
16-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
17-
RELEASE_NEEDS_CLEAN_BUILD = 1
18-
CFLAGS_INLINE_LIMIT = 35
19-
endif
14+
SUPEROPT_VM = 0

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14-
15-
CFLAGS_BOARD = --param max-inline-insns-auto=15
16-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
17-
RELEASE_NEEDS_CLEAN_BUILD = 1
18-
CFLAGS_INLINE_LIMIT = 35
19-
endif
20-
ifeq ($(TRANSLATION), de_DE)
21-
RELEASE_NEEDS_CLEAN_BUILD = 1
22-
CFLAGS_INLINE_LIMIT = 35
2314
SUPEROPT_VM = 0
24-
endif

‎ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,8 @@ CIRCUITPY_VECTORIO = 0
2525

2626
CFLAGS_INLINE_LIMIT = 55
2727
SUPEROPT_GC = 0
28+
SUPEROPT_VM = 0
2829

2930
# Include these Python libraries in firmware.
3031
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
3132
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
32-
33-
CFLAGS_BOARD = --param max-inline-insns-auto=15
34-
ifeq ($(TRANSLATION), ja)
35-
RELEASE_NEEDS_CLEAN_BUILD = 1
36-
CFLAGS_INLINE_LIMIT = 35
37-
endif
38-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
39-
RELEASE_NEEDS_CLEAN_BUILD = 1
40-
CFLAGS_INLINE_LIMIT = 35
41-
endif
42-
ifeq ($(TRANSLATION), de_DE)
43-
RELEASE_NEEDS_CLEAN_BUILD = 1
44-
CFLAGS_INLINE_LIMIT = 35
45-
SUPEROPT_VM = 0
46-
endif

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ LONGINT_IMPL = NONE
1212
CIRCUITPY_FULL_BUILD = 0
1313

1414
SUPEROPT_GC = 0
15+
SUPEROPT_VM = 0

‎ports/atmel-samd/boards/ndgarage_ndbit6_v2/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ LONGINT_IMPL = NONE
1212
CIRCUITPY_FULL_BUILD = 0
1313

1414
SUPEROPT_GC = 0
15+
SUPEROPT_VM = 0

‎ports/atmel-samd/boards/neopixel_trinkey_m0/mpconfigboard.mk

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

12-
SUPEROPT_GC = 0
13-
1412
CIRCUITPY_ANALOGIO = 0
1513
CIRCUITPY_ROTARYIO = 0
1614
CIRCUITPY_RTC = 0
@@ -28,16 +26,8 @@ CIRCUITPY_USB_MIDI = 1
2826
CIRCUITPY_TOUCHIO = 1
2927
CIRCUITPY_FULL_BUILD = 0
3028

31-
CFLAGS_BOARD = --param max-inline-insns-auto=15
32-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
33-
RELEASE_NEEDS_CLEAN_BUILD = 1
34-
CFLAGS_INLINE_LIMIT = 35
35-
endif
36-
ifeq ($(TRANSLATION), de_DE)
37-
RELEASE_NEEDS_CLEAN_BUILD = 1
38-
CFLAGS_INLINE_LIMIT = 35
29+
SUPEROPT_GC = 0
3930
SUPEROPT_VM = 0
40-
endif
4131

4232
# Include these Python libraries in firmware.
4333
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ CIRCUITPY_SAMD = 0
2020
CIRCUITPY_USB_MIDI = 0
2121

2222
SUPEROPT_GC = 0
23+
SUPEROPT_VM = 0
2324

2425
FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-standalone-10.x
25-
26-
CFLAGS_BOARD = --param max-inline-insns-auto=15
27-
ifeq ($(TRANSLATION), de_DE)
28-
RELEASE_NEEDS_CLEAN_BUILD = 1
29-
CFLAGS_INLINE_LIMIT = 35
30-
SUPEROPT_VM = 0
31-
endif

‎ports/atmel-samd/boards/picoplanet/mpconfigboard.mk

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,4 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
14-
15-
CFLAGS_BOARD = --param max-inline-insns-auto=15
16-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
17-
RELEASE_NEEDS_CLEAN_BUILD = 1
18-
CFLAGS_INLINE_LIMIT = 35
19-
endif
20-
ifeq ($(TRANSLATION), de_DE)
21-
RELEASE_NEEDS_CLEAN_BUILD = 1
22-
CFLAGS_INLINE_LIMIT = 35
2314
SUPEROPT_VM = 0
24-
endif

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ CIRCUITPY_SAMD = 0
2121
CIRCUITPY_USB_MIDI = 1
2222
CIRCUITPY_TOUCHIO = 0
2323
CIRCUITPY_FULL_BUILD = 0
24-
# Make more room.
24+
2525
SUPEROPT_GC = 0
26+
SUPEROPT_VM = 0
2627

2728
# Include these Python libraries in firmware.
2829
# FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
2930
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
3031
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_IRRemote
31-
32-
CFLAGS_BOARD = --param max-inline-insns-auto=12

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212
CIRCUITPY_COUNTIO = 0
1313
CIRCUITPY_RTC = 0
14-
SUPEROPT_GC = 0
1514

16-
CFLAGS_BOARD = --param max-inline-insns-auto=15
17-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
18-
RELEASE_NEEDS_CLEAN_BUILD = 1
19-
CFLAGS_INLINE_LIMIT = 35
20-
endif
15+
SUPEROPT_GC = 0
16+
SUPEROPT_VM = 0

‎ports/atmel-samd/boards/qtpy_m0/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
1414
SUPEROPT_VM = 0
15-
16-
CFLAGS_BOARD = --param max-inline-insns-auto=15

‎ports/atmel-samd/boards/serpente/mpconfigboard.mk

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,4 @@ CIRCUITPY_GAMEPAD = 0
1717
CIRCUITPY_BUSDEVICE = 0
1818

1919
SUPEROPT_GC = 0
20-
21-
CFLAGS_BOARD = --param max-inline-insns-auto=15
22-
ifeq ($(TRANSLATION), zh_Latn_pinyin)
23-
RELEASE_NEEDS_CLEAN_BUILD = 1
24-
CFLAGS_INLINE_LIMIT = 35
25-
endif
26-
ifeq ($(TRANSLATION), ja)
27-
RELEASE_NEEDS_CLEAN_BUILD = 1
28-
CFLAGS_INLINE_LIMIT = 35
29-
endif
30-
ifeq ($(TRANSLATION), de_DE)
31-
RELEASE_NEEDS_CLEAN_BUILD = 1
32-
CFLAGS_INLINE_LIMIT = 35
3320
SUPEROPT_VM = 0
34-
endif

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ CIRCUITPY_I2CPERIPHERAL = 1
1313
CIRCUITPY_TOUCHIO = 0
1414

1515
SUPEROPT_GC = 0
16-
17-
CFLAGS_BOARD = --param max-inline-insns-auto=15
16+
SUPEROPT_VM = 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111

1212
CIRCUITPY_FULL_BUILD = 0
13+
1314
SUPEROPT_GC = 0
15+
SUPEROPT_VM = 0

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,5 @@ INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

13-
ifeq ($(TRANSLATION),de_DE)
14-
RELEASE_NEEDS_CLEAN_BUILD = 1
15-
CFLAGS_INLINE_LIMIT = 35
16-
SUPEROPT_VM = 0
17-
endif
18-
1913
SUPEROPT_GC = 0
14+
SUPEROPT_VM = 0

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ CIRCUITPY_FULL_BUILD = 0
1212

1313
SUPEROPT_GC = 0
1414
SUPEROPT_VM = 0
15-
CFLAGS_INLINE_LIMIT = 45

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,5 @@ INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
1212

13-
# Always use aggressive inlining
14-
CFLAGS_INLINE_LIMIT = 45
15-
1613
SUPEROPT_GC = 0
14+
SUPEROPT_VM = 0

0 commit comments

Comments
 (0)
0