djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed compiler flag in favor of MP_WEAK implementation

Browse Source
This commit is contained in:
George White 2022-04-18 03:18:25 +00:00
parent 0ba93b20e5
commit 32fc084b39
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.c
View File

@ -836,11 +836,9 @@ int __attribute__((used)) main(void) {
// Start the debug serial // Start the debug serial
serial_early_init(); serial_early_init();
#if CIRCUITPY_EXTERNAL_FLASH_SETUP
// Set up anything that might need to get done before we try to use SPI flash // Set up anything that might need to get done before we try to use SPI flash
// This is needed for some boards where flash relies on GPIO setup to work // This is needed for some boards where flash relies on GPIO setup to work
external_flash_setup(); external_flash_setup();
#endif
// Create a new filesystem only if we're not in a safe mode. // Create a new filesystem only if we're not in a safe mode.
// A power brownout here could make it appear as if there's // A power brownout here could make it appear as if there's
@ -984,3 +982,6 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
__fatal_error("Assertion failed"); __fatal_error("Assertion failed");
} }
#endif #endif
void MP_WEAK external_flash_setup(void) {
}

1
ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk
View File

@ -13,4 +13,3 @@ EXTERNAL_FLASH_DEVICES = W25Q128JVxM
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
CIRCUITPY_PS2IO = 1 CIRCUITPY_PS2IO = 1
CIRCUITPY_EXTERNAL_FLASH_SETUP = 1

4
py/circuitpy_mpconfig.mk
View File

@ -49,10 +49,6 @@ CFLAGS += -DMICROPY_PY_USELECT=$(MICROPY_PY_USELECT)
MICROPY_PY_USELECT_SELECT ?= $(MICROPY_PY_USELECT) MICROPY_PY_USELECT_SELECT ?= $(MICROPY_PY_USELECT)
CFLAGS += -DMICROPY_PY_USELECT_SELECT=$(MICROPY_PY_USELECT_SELECT) CFLAGS += -DMICROPY_PY_USELECT_SELECT=$(MICROPY_PY_USELECT_SELECT)
# enable pre-flash GPIO setup
CIRCUITPY_EXTERNAL_FLASH_SETUP ?= 0
CFLAGS += -DCIRCUITPY_EXTERNAL_FLASH_SETUP=$(CIRCUITPY_EXTERNAL_FLASH_SETUP)
CIRCUITPY_AESIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_AESIO ?= $(CIRCUITPY_FULL_BUILD)
CFLAGS += -DCIRCUITPY_AESIO=$(CIRCUITPY_AESIO) CFLAGS += -DCIRCUITPY_AESIO=$(CIRCUITPY_AESIO)