Skip to content

Commit 04622e7

Browse files
committed
Update broadcom compiler and shrink stm boards
1 parent 1cb188d commit 04622e7

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

.github/actions/deps/ports/broadcom/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ runs:
55
steps:
66
- name: Get broadcom toolchain
77
run: |
8-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
9-
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
8+
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
9+
sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
1010
sudo apt-get update
1111
sudo apt-get install -y mtools
1212
shell: bash

ports/stm/boards/meowbit_v121/mpconfigboard.mk

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ CIRCUITPY_BITMAPFILTER = 0
2727
CIRCUITPY_BITMAPTOOLS = 0
2828
CIRCUITPY_BLEIO_HCI = 0
2929
CIRCUITPY_EPAPERDISPLAY = 0
30+
CIRCUITPY_FRAMEBUFFERIO = 0
31+
CIRCUITPY_I2CDISPLAYBUS = 0
3032
CIRCUITPY_KEYPAD_DEMUX = 0
3133
CIRCUITPY_SHARPDISPLAY = 0
3234
CIRCUITPY_TILEPALETTEMAPPER = 0

ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ MCU_SERIES = F4
99
MCU_VARIANT = STM32F411xE
1010
MCU_PACKAGE = LQFP100_f4
1111

12+
OPTIMIZATION_FLAGS = -Os
13+
1214
LD_COMMON = boards/common_default.ld
1315
LD_FILE = boards/STM32F411_fs.ld
1416

ports/stm/boards/thunderpack_v11/mpconfigboard.mk

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ MCU_SERIES = F4
1313
MCU_VARIANT = STM32F411xE
1414
MCU_PACKAGE = UFQFPN48
1515

16+
OPTIMIZATION_FLAGS = -Os
17+
1618
LD_COMMON = boards/common_nvm.ld
1719
LD_FILE = boards/STM32F411_nvm.ld
1820

ports/stm/boards/thunderpack_v12/mpconfigboard.mk

+2-6
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ MCU_SERIES = F4
2525
MCU_VARIANT = STM32F411xE
2626
MCU_PACKAGE = UFQFPN48
2727

28+
OPTIMIZATION_FLAGS = -Os
29+
2830
LD_COMMON = boards/common_nvm.ld
2931
LD_FILE = boards/STM32F411_nvm_nofs.ld
30-
31-
# Disable TERMINALIO on translations with missing characters.
32-
ifneq (,$(filter $(TRANSLATION),ja ko ru))
33-
CIRCUITPY_TERMINALIO = 0
34-
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
35-
endif

shared/runtime/pyexec.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
9191
nlr_buf_t nlr;
9292
nlr.ret_val = NULL;
9393
if (nlr_push(&nlr) == 0) {
94-
mp_obj_t module_fun;
94+
mp_obj_t module_fun = mp_const_none;
9595
// CIRCUITPY-CHANGE
9696
#if CIRCUITPY_ATEXIT
9797
if (!(exec_flags & EXEC_FLAG_SOURCE_IS_ATEXIT))
@@ -157,7 +157,7 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
157157
mp_call_function_n_kw(callback->func, callback->n_pos, callback->n_kw, callback->args);
158158
} else
159159
#endif
160-
{
160+
if (module_fun != mp_const_none) {
161161
mp_call_function_0(module_fun);
162162
}
163163
mp_hal_set_interrupt_char(-1); // disable interrupt

0 commit comments

Comments
 (0)