Skip to content

Commit 32fc084

Browse files
committed
Removed compiler flag in favor of MP_WEAK implementation
1 parent 0ba93b2 commit 32fc084

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,11 +836,9 @@ int __attribute__((used)) main(void) {
836836
// Start the debug serial
837837
serial_early_init();
838838

839-
#if CIRCUITPY_EXTERNAL_FLASH_SETUP
840839
// Set up anything that might need to get done before we try to use SPI flash
841840
// This is needed for some boards where flash relies on GPIO setup to work
842841
external_flash_setup();
843-
#endif
844842

845843
// Create a new filesystem only if we're not in a safe mode.
846844
// 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
984982
__fatal_error("Assertion failed");
985983
}
986984
#endif
985+
986+
void MP_WEAK external_flash_setup(void) {
987+
}

ports/atmel-samd/boards/sparkfun_samd51_micromod/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ EXTERNAL_FLASH_DEVICES = W25Q128JVxM
1313
LONGINT_IMPL = MPZ
1414

1515
CIRCUITPY_PS2IO = 1
16-
CIRCUITPY_EXTERNAL_FLASH_SETUP = 1

py/circuitpy_mpconfig.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ CFLAGS += -DMICROPY_PY_USELECT=$(MICROPY_PY_USELECT)
4949
MICROPY_PY_USELECT_SELECT ?= $(MICROPY_PY_USELECT)
5050
CFLAGS += -DMICROPY_PY_USELECT_SELECT=$(MICROPY_PY_USELECT_SELECT)
5151

52-
# enable pre-flash GPIO setup
53-
CIRCUITPY_EXTERNAL_FLASH_SETUP ?= 0
54-
CFLAGS += -DCIRCUITPY_EXTERNAL_FLASH_SETUP=$(CIRCUITPY_EXTERNAL_FLASH_SETUP)
55-
5652
CIRCUITPY_AESIO ?= $(CIRCUITPY_FULL_BUILD)
5753
CFLAGS += -DCIRCUITPY_AESIO=$(CIRCUITPY_AESIO)
5854

0 commit comments

Comments
 (0)