From e837028f71226c67e4ce156222c280ffcbc46cd8 Mon Sep 17 00:00:00 2001 From: Erik Bogg Date: Wed, 8 Mar 2023 13:40:48 +0100 Subject: [PATCH] Weak assignment in flash_hal The assignment done in FLASH_MAP_SETUP_CONFIG_ATTR did not apply the attribute to __flashdesc, and made it impossible to override it with FLASH_MAP_SETUP_CONFIG. --- cores/esp8266/flash_hal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp8266/flash_hal.h b/cores/esp8266/flash_hal.h index 682e1dcfb1..061b1d0b08 100644 --- a/cores/esp8266/flash_hal.h +++ b/cores/esp8266/flash_hal.h @@ -43,7 +43,7 @@ extern const flash_map_s __flashdesc[]; #define FLASH_MAP_SETUP_CONFIG(conf) FLASH_MAP_SETUP_CONFIG_ATTR(,conf) #define FLASH_MAP_SETUP_CONFIG_ATTR(attr, conf...) \ - const flash_map_s __flashdesc[] PROGMEM = conf; \ + extern const flash_map_s __flashdesc[] PROGMEM attr = conf; \ const char *flashinit (void) attr; \ const char *flashinit (void) \ { \