rename: AUTOFLASHSIZE -> FLASH_MAP_SUPPORT

esp8266 · d-a-v · Feb 10, 2022 · Oct 29, 2019 · Oct 29, 2019 · Oct 29, 2019
commit 058c201c90aa31b1984d550cb7c3650d218c83ed
diff --git a/boards.txt b/boards.txt
diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h
@@ -186,7 +186,7 @@ void attachInterrupt(uint8_t pin, void (*)(void), int mode);
 void detachInterrupt(uint8_t pin);
 void attachInterruptArg(uint8_t pin, void (*)(void*), void* arg, int mode);
 
-#if AUTOFLASHSIZE
+#if FLASH_MAP_SUPPORT
 #include <flash_hal.h>
 #endif
 void preinit(void);

diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
@@ -291,7 +291,7 @@ uint32_t EspClass::getFlashChipRealSize(void)
 
 uint32_t EspClass::getFlashChipSize(void)
 {
-#if AUTOFLASHSIZE
+#if FLASH_MAP_SUPPORT
  return getFlashChipRealSize();
 #else
  uint32_t data;
@@ -327,7 +327,7 @@ FlashMode_t EspClass::getFlashChipMode(void)
  return mode;
 }
 
-#if !AUTOFLASHSIZE
+#if !FLASH_MAP_SUPPORT
 uint32_t EspClass::magicFlashChipSize(uint8_t byte) {
  switch(byte & 0x0F) {
  case 0x0: // 4 Mbit (512KB)

diff --git a/cores/esp8266/Updater.cpp b/cores/esp8266/Updater.cpp
@@ -461,7 +461,7 @@ bool UpdaterClass::_verifyEnd() {
 
 // it makes no sense to check flash size in auto flash mode
 // (sketch size would have to be set in bin header, instead of flash size)
-#if !AUTOFLASHSIZE
+#if !FLASH_MAP_SUPPORT
  uint32_t bin_flash_size = ESP.magicFlashChipSize((buf[3] & 0xf0) >> 4);
 
  // check if new bin fits to SPI flash

diff --git a/cores/esp8266/core_esp8266_main.cpp b/cores/esp8266/core_esp8266_main.cpp
@@ -393,7 +393,7 @@ extern "C" void __disableWiFiAtBootTime (void)
  wifi_fpm_do_sleep(0xFFFFFFF);
 }
 
-#if AUTOFLASHSIZE
+#if FLASH_MAP_SUPPORT
 #include "flash_hal.h"
 extern "C" void flashinit (void);
 uint32_t __flashindex;
@@ -428,7 +428,7 @@ extern "C" void user_init(void) {
 #if defined(MMU_IRAM_HEAP)
  umm_init_iram();
 #endif
-#if AUTOFLASHSIZE
+#if FLASH_MAP_SUPPORT
  flashinit();
 #endif
  preinit(); // Prior to C++ Dynamic Init (not related to above init() ). Meant to be user redefinable.

diff --git a/cores/esp8266/flash_hal.cpp b/cores/esp8266/flash_hal.cpp
@@ -69,7 +69,7 @@ int32_t flash_hal_erase(uint32_t addr, uint32_t size) {
  return FLASH_HAL_OK;
 }
 
-#if AUTOFLASHSIZE
+#if FLASH_MAP_SUPPORT
 
 // default weak configuration:
 FLASH_MAP_SETUP_CONFIG_ATTR(__attribute__((weak)), FLASH_MAP_OTA_FS)

diff --git a/cores/esp8266/flash_hal.h b/cores/esp8266/flash_hal.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#if AUTOFLASHSIZE
+#if FLASH_MAP_SUPPORT
 #include <FlashMap.h>
 
 extern uint32_t spi_flash_get_id (void); // <user_interface.h>
@@ -56,7 +56,7 @@ extern const flash_map_s __flashdesc[];
 #define FS_block (__flashdesc[__flashindex].fs_block_size)
 #define FS_page (__flashdesc[__flashindex].fs_page_size)
 
-#else // !AUTOFLASHSIZE
+#else // !FLASH_MAP_SUPPORT
 
 extern uint32_t _FS_start;
 extern uint32_t _FS_end;
@@ -69,7 +69,7 @@ extern uint32_t _EEPROM_start;
 #define FS_page ((uint32_t)&_FS_page)
 #define FS_block ((uint32_t)&_FS_block)
 
-#endif // AUTOFLASHSIZE
+#endif // FLASH_MAP_SUPPORT
 
 #define FS_PHYS_ADDR ((uint32_t)FS_start - 0x40200000)
 #define FS_PHYS_SIZE ((uint32_t)(FS_end - FS_start))

diff --git a/doc/filesystem.rst b/doc/filesystem.rst
@@ -26,7 +26,7 @@ Another option called ``Mapping defined by Hardware and Sketch`` is available.
 It allows a sketch, not the user, to select FS configuration at boot
 according to flash chip size.
 
-This option is also enabled with this compilation define: ``-DAUTOFLASHSIZE=1``.
+This option is also enabled with this compilation define: ``-DFLASH_MAP_SUPPORT=1``.
 
 There are three possible configurations:
 

diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@@ -292,7 +292,7 @@ HTTPUpdateResult ESP8266HTTPUpdate::handleUpdate(HTTPClient& http, const String&
 
 // it makes no sense to check flash size in auto flash mode
 // (sketch size would have to be set in bin header, instead of flash size)
-#if !AUTOFLASHSIZE
+#if !FLASH_MAP_SUPPORT
  if (buf[0] == 0xe9) {
  uint32_t bin_flash_size = ESP.magicFlashChipSize((buf[3] & 0xf0) >> 4);
 

diff --git a/tools/boards.txt.py b/tools/boards.txt.py
@@ -1604,7 +1604,7 @@ def all_flash_map ():
  '.menu.eesz.autoflash': 'Mapping defined by Hardware and Sketch',
  '.menu.eesz.autoflash.build.flash_size': '16M',
  '.menu.eesz.autoflash.build.flash_ld': 'eagle.flash.auto.ld',
- '.menu.eesz.autoflash.build.extra_flags': '-DAUTOFLASHSIZE=1',
+ '.menu.eesz.autoflash.build.extra_flags': '-DFLASH_MAP_SUPPORT=1',
  '.menu.eesz.autoflash.upload.maximum_size': '1044464',
  },
  '512K': f512,