Support for nonos-sdk 3.0.5 & bugs fix

Requires package framework-esp8266-nonos-sdk@ 3.0.5
https://github.com/freedib/framework-esp8266-nonos-sdk.git

Fix build bugs
  platform.py
    - Remove dependency to xtensa 1.40802.0
  esp8266-nonos-sdk & esp8266-rtos-sdk
    - Suppress literal-suffix warnings from SDK building
    - Set correct libraries list for nonos-sdk & rtos-sdk
  esp8266-nonos-sdk
    - Set correct include paths for nonos-sdk
    - Avoid building SDK drivers on each run for nonos-sdk

Support for nonos-sdk 3.0.5
  platform.json:
    - Update nonos-sdk and rtos-sdk version numbers
  esp8266-nonos-sdk.py:
    - Add SPI_FLASH_SIZE_MAP to compile flags
    - Use the new "esp_init_data_default_v08.bin" file for NONOS 3.0.4

Author: freedib

builder/frameworks/esp8266-nonos-sdk.py

@@ -20,7 +20,7 @@
 https://github.com/espressif/ESP8266_NONOS_SDK
 """
 
-from os.path import isdir, join
+from os.path import isdir, join, isfile
 
 from SCons.Script import Builder, DefaultEnvironment
 
@@ -61,7 +61,8 @@
     CXXFLAGS=[
         "-fno-rtti",
         "-fno-exceptions",
-        "-std=c++11"
+        "-std=c++11",
+        "-Wno-literal-suffix"
     ],
 
     LINKFLAGS=[
@@ -83,16 +84,8 @@
 
     CPPPATH=[
         join(FRAMEWORK_DIR, "include"),
-        join(FRAMEWORK_DIR, "extra_include"),
         join(FRAMEWORK_DIR, "driver_lib", "include"),
-        join(FRAMEWORK_DIR, "include", "espressif"),
-        join(FRAMEWORK_DIR, "include", "lwip"),
-        join(FRAMEWORK_DIR, "include", "lwip", "ipv4"),
-        join(FRAMEWORK_DIR, "include", "lwip", "ipv6"),
-        join(FRAMEWORK_DIR, "include", "nopoll"),
-        join(FRAMEWORK_DIR, "include", "ssl"),
-        join(FRAMEWORK_DIR, "include", "json"),
-        join(FRAMEWORK_DIR, "include", "openssl")
+        join(FRAMEWORK_DIR, "third_party", "include")
     ],
 
     LIBPATH=[
@@ -102,7 +95,7 @@
 
     LIBS=[
         "airkiss", "at", "c", "crypto", "driver", "espnow", "gcc", "json",
-        "lwip", "main", "mbedtls", "mesh", "net80211", "phy", "pp", "pwm",
+        "lwip", "main", "mbedtls", "net80211", "phy", "pp", "pwm",
         "smartconfig", "ssl", "upgrade", "wpa", "wpa2", "wps"
     ],
 
@@ -133,25 +126,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
+# evaluate SPI_FLASH_SIZE_MAP flag for NONOS_SDK 3.x and set CCFLAG
+board_flash_size = int(env.BoardConfig().get("upload.maximum_size", 524288))
+flash_size_maps = [0.5, 0.25, 1.0, 0.0, 0.0, 2.0, 4.0, 0.0, 8.0, 16.0]  # ignore maps 3 and 4.prefer 5 and 6
+flash_sizes_str = ['512KB','256KB','1MB','2MB','4MB','2MB-c1','4MB-c1','4MB-c2','8MB','16MB']
+try:
+    flash_size_map = flash_size_maps.index(board_flash_size/1048576)
+    flash_size_str = flash_sizes_str[flash_size_map]
+except:
+    flash_size_map = 6
+    flash_size_str = '4MB-c1'
+# for OTA, only size maps 5, 6, 8 and 9 are supported to avoid linking twice for user1 and user2
+
+env.Append(CCFLAGS=["-DSPI_FLASH_SIZE_MAP="+str(flash_size_map)])     # NONOS-SDK 3.x user_main.c need it
+
+init_data_flash_address  = board_flash_size-0x4000     # 3fc000 for 4M board data_bin
+
+
+esp_init_data_default_file = "esp_init_data_default_v08.bin"       # new in NONS 3.04
+if not isfile(join(FRAMEWORK_DIR, "bin", esp_init_data_default_file)):
+    esp_init_data_default_file = "esp_init_data_default.bin"
 
 env.Append(
     FLASH_EXTRA_IMAGES=[
         ("0x10000", join("$BUILD_DIR", "${PROGNAME}.bin.irom0text.bin")),
         (hex(init_data_flash_address),
-            join(FRAMEWORK_DIR, "bin", "esp_init_data_default.bin")),
+            join(FRAMEWORK_DIR, "bin", esp_init_data_default_file)),
         (hex(init_data_flash_address + 0x2000),
             join(FRAMEWORK_DIR, "bin", "blank.bin"))
     ]
@@ -164,9 +164,10 @@
 
 libs = []
 
-libs.append(env.BuildLibrary(
-    join(FRAMEWORK_DIR, "lib", "driver"),
-    join(FRAMEWORK_DIR, "driver_lib")
-))
+if False:
+    libs.append(env.BuildLibrary(
+        join(FRAMEWORK_DIR, "lib", "driver"),
+        join(FRAMEWORK_DIR, "driver_lib")
+    ))
 
 env.Prepend(LIBS=libs)

builder/frameworks/esp8266-rtos-sdk.py

@@ -61,7 +61,8 @@
     CXXFLAGS=[
         "-fno-rtti",
         "-fno-exceptions",
-        "-std=c++11"
+        "-std=c++11",
+        "-Wno-literal-suffix"
     ],
 
     LINKFLAGS=[
@@ -103,7 +104,7 @@
 
     LIBS=[
         "cirom", "crypto", "driver", "espconn", "espnow", "freertos", "gcc",
-        "json", "hal", "lwip", "main", "mesh", "mirom", "net80211", "nopoll",
+        "json", "hal", "lwip", "main", "mbedtls", "mesh", "mirom", "net80211", "nopoll",
         "phy", "pp", "pwm", "smartconfig", "spiffs", "ssl", "wpa", "wps"
     ],
 

platform.json

@@ -55,13 +55,13 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": ">=1.5.0-beta"
+      "version": "==1.5.0-beta.5"
     },
     "framework-esp8266-nonos-sdk": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": ">=2.1.0"
+      "version": "~3.0.5"
     },
     "tool-esptool": {
       "type": "uploader",

platform.py

@@ -19,8 +19,6 @@ class Espressif8266Platform(PlatformBase):
 
     def configure_default_packages(self, variables, targets):
         framework = variables.get("pioframework", [])
-        if "arduino" not in framework:
-            self.packages['toolchain-xtensa']['version'] = "~1.40802.0"
         if "buildfs" in targets:
             self.packages['tool-mkspiffs']['optional'] = False
             self.packages['tool-mklittlefs']['optional'] = False