Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/cortex-m-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ echo -e "[cortex-m-toolchain.sh] downloading and installing gcc-arm-non-eabi too
cd /workspaces

wget -qO gcc-arm-none-eabi.tar.xz \
https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi.tar.xz

tar -xJf gcc-arm-none-eabi.tar.xz
ln -s arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
ln -s arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
rm -f gcc-arm-none-eabi.tar.xz

echo -e "[cortex-m-toolchain.sh] update PATH in environment"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deps/external/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
uses: carlosperate/arm-none-eabi-gcc-action@v1
with:
# When changing this update what Windows grabs too!
release: '14.2.Rel1'
release: '15.2.Rel1'

# espressif
- name: Get espressif toolchain
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/deps/ports/broadcom/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ runs:
steps:
- name: Get broadcom toolchain
run: |
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-elf.tar.xz
sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-elf.tar.xz
sudo apt-get update
sudo apt-get install -y mtools
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ jobs:
python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
- name: Install dependencies
run: |
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-mingw-w64-i686-arm-none-eabi.zip
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-mingw-w64-i686-arm-none-eabi.zip
unzip -q -d /tmp/arm-gnu-toolchain gcc-arm.zip
tar -C /tmp/arm-gnu-toolchain -cf - . | tar -C /usr/local -xf -
# We could use a venv instead, but that requires entering the venv on each run step
Expand Down
2 changes: 1 addition & 1 deletion ports/cxd56/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ CFLAGS += \
-fdata-sections \
-Wall \

OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions
OPTIMIZATION_FLAGS ?= -O2

# option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
CFLAGS += $(OPTIMIZATION_FLAGS)
Expand Down
2 changes: 2 additions & 0 deletions ports/cxd56/common-hal/microcontroller/__init__.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
void common_hal_mcu_reset(void) {
filesystem_flush();
boardctl(BOARDIOC_RESET, 0);
// boardctl is noreturn in this case.
__builtin_unreachable();
}

static const mp_rom_map_elem_t mcu_pin_globals_table[] = {
Expand Down
2 changes: 1 addition & 1 deletion ports/litex/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ifeq ($(DEBUG), 1)
OPTIMIZATION_FLAGS ?= -Og
else
CFLAGS += -DNDEBUG -ggdb3
OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions
OPTIMIZATION_FLAGS ?= -O2
endif

# option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
Expand Down
4 changes: 2 additions & 2 deletions ports/nordic/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ ifeq ($(DEBUG), 1)
CFLAGS += -ggdb3
OPTIMIZATION_FLAGS = -Og
else
OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions
CFLAGS += -DNDEBUG -ggdb3
OPTIMIZATION_FLAGS ?= -O2
CFLAGS += -DNDEBUG
endif

ifeq ($(NRF_DEBUG_PRINT), 1)
Expand Down
2 changes: 1 addition & 1 deletion ports/silabs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ifeq ($(DEBUG), 1)
CFLAGS += -fno-inline -fno-ipa-sra -Og
else
CFLAGS += -DNDEBUG
OPTIMIZATION_FLAGS ?= -Os -fno-inline-functions
OPTIMIZATION_FLAGS ?= -Os
CFLAGS += -g
endif

Expand Down
3 changes: 1 addition & 2 deletions ports/stm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ ifeq ($(DEBUG), 1)
CFLAGS += -fno-inline -fno-ipa-sra
else
CFLAGS += -DNDEBUG
OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions
CFLAGS += -ggdb3
OPTIMIZATION_FLAGS ?= -O2
endif

# to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C,W25Q16JVxQ,W25Q64FV,W25Q32JVxQ,W25Q64JVxQ
LONGINT_IMPL = MPZ

INTERNAL_FLASH_FILESYSTEM = 0
OPTIMIZATION_FLAGS = -Os

MCU_SERIES = F4
MCU_VARIANT = STM32F411xE
Expand Down
4 changes: 4 additions & 0 deletions ports/stm/mpconfigport.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx))
USB_NUM_ENDPOINT_PAIRS = 4
endif

ifeq ($(INTERNAL_FLASH_FILESYSTEM),1)
OPTIMIZATION_FLAGS ?= -Os
endif

ifeq ($(MCU_VARIANT),STM32F407xx)
UF2_FAMILY_ID ?= 0x6d0922fa
endif
Expand Down