Flash blank.bin automatically for NONOS SDK and RTOS SDK // Resolve #62 Resolve #133

Author: ivankravets

builder/frameworks/esp8266-nonos-sdk.py

@@ -99,14 +99,6 @@
         "airkiss", "at", "c", "crypto", "driver", "espnow", "gcc", "json", "lwip",
         "main", "mbedtls", "mesh", "net80211", "phy", "pp", "pwm", "smartconfig",
         "ssl", "upgrade", "wpa", "wpa2", "wps"
-    ],
-
-    FLASH_EXTRA_IMAGES=[
-        ("0x00000", join("$BUILD_DIR", "eagle.flash.bin")),
-        ("0x10000", join("$BUILD_DIR", "eagle.irom0text.bin")),
-        ("0x1fc000" if env.BoardConfig().get(
-            "upload.maximum_size", 0) < 4194304 else "0x3fc000",
-            join(FRAMEWORK_DIR, "bin", "esp_init_data_default.bin"))
     ]
 )
 
@@ -117,6 +109,32 @@
     LDSCRIPT_PATH=join(FRAMEWORK_DIR, "ld", "eagle.app.v6.ld")
 )
 
+board_flash_size = int(env.BoardConfig().get("upload.maximum_size", 0))
+if board_flash_size > 8388608:
+    init_data_flash_address = 0xffc000  # for 16 MB
+elif board_flash_size > 4194304:
+    init_data_flash_address = 0x7fc000  # for 8 MB
+elif board_flash_size > 2097152:
+    init_data_flash_address = 0x3fc000  # for 4 MB
+elif board_flash_size > 1048576:
+    init_data_flash_address = 0x1fc000  # for 2 MB
+elif board_flash_size > 524288:
+    init_data_flash_address = 0xfc000  # for 1 MB
+else:
+    init_data_flash_address = 0x7c000  # for 512 kB
+
+env.Append(
+    FLASH_EXTRA_IMAGES=[
+        ("0x00000", join("$BUILD_DIR", "eagle.flash.bin")),
+        ("0x10000", join("$BUILD_DIR", "eagle.irom0text.bin")),
+        (hex(init_data_flash_address),
+            join(FRAMEWORK_DIR, "bin", "esp_init_data_default.bin")),
+        (hex(init_data_flash_address + 0x2000),
+            join(FRAMEWORK_DIR, "bin", "blank.bin"))
+    ]
+)
+
+
 #
 # Target: Build Driver Library
 #

builder/frameworks/esp8266-rtos-sdk.py

@@ -99,14 +99,6 @@
         "cirom", "crypto", "driver", "espconn", "espnow", "freertos", "gcc",
         "json", "hal", "lwip", "main", "mesh", "mirom", "net80211", "nopoll",
         "phy", "pp", "pwm", "smartconfig", "spiffs", "ssl", "wpa", "wps"
-    ],
-
-    FLASH_EXTRA_IMAGES=[
-        ("0x00000", join("$BUILD_DIR", "eagle.flash.bin")),
-        ("0x10000", join("$BUILD_DIR", "eagle.irom0text.bin")),
-        ("0x1fc000" if env.BoardConfig().get(
-            "upload.maximum_size", 0) < 4194304 else "0x3fc000",
-            join(FRAMEWORK_DIR, "bin", "esp_init_data_default.bin"))
     ]
 )
 
@@ -117,6 +109,32 @@
     LDSCRIPT_PATH=join(FRAMEWORK_DIR, "ld", "eagle.app.v6.ld"),
 )
 
+# Extra flash images
+board_flash_size = int(env.BoardConfig().get("upload.maximum_size", 0))
+if board_flash_size > 8388608:
+    init_data_flash_address = 0xffc000  # for 16 MB
+elif board_flash_size > 4194304:
+    init_data_flash_address = 0x7fc000  # for 8 MB
+elif board_flash_size > 2097152:
+    init_data_flash_address = 0x3fc000  # for 4 MB
+elif board_flash_size > 1048576:
+    init_data_flash_address = 0x1fc000  # for 2 MB
+elif board_flash_size > 524288:
+    init_data_flash_address = 0xfc000  # for 1 MB
+else:
+    init_data_flash_address = 0x7c000  # for 512 kB
+
+env.Append(
+    FLASH_EXTRA_IMAGES=[
+        ("0x00000", join("$BUILD_DIR", "eagle.flash.bin")),
+        ("0x20000", join("$BUILD_DIR", "eagle.irom0text.bin")),
+        (hex(init_data_flash_address),
+            join(FRAMEWORK_DIR, "bin", "esp_init_data_default.bin")),
+        (hex(init_data_flash_address + 0x2000),
+            join(FRAMEWORK_DIR, "bin", "blank.bin"))
+    ]
+)
+
 #
 # Target: Build Driver Library
 #