diff options
| author | Dan Halbert <halbert@adafruit.com> | 2020-12-17 11:03:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-17 11:03:40 -0500 |
| commit | 8f9cd7075e706b714ff0166414f399d521f6302b (patch) | |
| tree | 85854ea3e476cf67dfe4d8e7a6b5d943ab757675 /ports/nrf | |
| parent | 68dd4b2b37d35218e306a0de2efb659cbd505fb6 (diff) | |
| parent | 4521dfb73289eaa9d17cb61b29b49c10adf1f4a3 (diff) | |
Merge pull request #3752 from jepler/gcc10
build: Update to gcc10
Diffstat (limited to 'ports/nrf')
| -rwxr-xr-x | ports/nrf/Makefile | 2 | ||||
| -rw-r--r-- | ports/nrf/boards/simmel/mpconfigboard.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 3fef68e88..278625e92 100755 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -89,7 +89,7 @@ ifeq ($(DEBUG), 1) CFLAGS += -ggdb3 OPTIMIZATION_FLAGS = -Og else - OPTIMIZATION_FLAGS ?= -O2 + OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions CFLAGS += -DNDEBUG -ggdb3 CFLAGS += -flto -flto-partition=none endif diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nrf/boards/simmel/mpconfigboard.mk index 704881b3c..dd6b1fbfd 100644 --- a/ports/nrf/boards/simmel/mpconfigboard.mk +++ b/ports/nrf/boards/simmel/mpconfigboard.mk @@ -16,12 +16,14 @@ CIRCUITPY_AUDIOMP3 = 0 CIRCUITPY_BUSIO = 1 CIRCUITPY_DISPLAYIO = 0 CIRCUITPY_FRAMEBUFFERIO = 0 +CIRCUITPY_GAMEPAD = 0 CIRCUITPY_NEOPIXEL_WRITE = 0 CIRCUITPY_NVM = 0 CIRCUITPY_PIXELBUF = 0 CIRCUITPY_RGBMATRIX = 0 CIRCUITPY_ROTARYIO = 0 CIRCUITPY_RTC = 1 +CIRCUITPY_SDCARDIO = 0 CIRCUITPY_TOUCHIO = 0 CIRCUITPY_ULAB = 0 CIRCUITPY_WATCHDOG = 1 |