Idf44/esp32 s3

Author: Jason2866

Diff for: .github/workflows/examples.yml

@@ -15,6 +15,7 @@ jobs:
           - "examples/arduino-wifiscan"
           - "examples/espidf-arduino-blink"
           - "examples/espidf-arduino-wifiscan"
+          - "examples/espidf-blink"
           - "examples/espidf-aws-iot"
           - "examples/espidf-ble-eddystone"
           - "examples/espidf-coap-server"

Diff for: README.md

@@ -1,6 +1,6 @@
-# Espressif 32: development platform for [PlatformIO](http://platformio.org)
+# Tasmota Espressif 32: development platform for [PlatformIO](http://platformio.org)
 
-[![Build Status](https://github.com/platformio/platform-espressif32/workflows/Examples/badge.svg)](https://github.com/platformio/platform-espressif32/actions)
+[![Examples](https://github.com/Jason2866/platform-espressif32/actions/workflows/examples.yml/badge.svg)](https://github.com/Jason2866/platform-espressif32/actions/workflows/examples.yml)
 
 Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
 
@@ -16,16 +16,7 @@ Espressif Systems is a privately held fabless semiconductor company. They provid
 
 ```ini
 [env:stable]
-platform = espressif32
-board = ...
-...
-```
-
-## Development version
-
-```ini
-[env:development]
-platform = https://github.com/platformio/platform-espressif32.git
+platform = replace with url
 board = ...
 ...
 ```

Diff for: boards/esp32-c3-devkitm-1.json

@@ -17,6 +17,7 @@
     "openocd_target": "esp32c3.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Espressif ESP32-C3-DevKitM-1",

Diff for: boards/esp32-s2-franzininho.json

@@ -11,7 +11,8 @@
     "variant": "esp32s2"
   },
   "connectivity": [
-    "wifi"
+    "arduino",
+    "espidf"
   ],
   "debug": {
     "openocd_target": "esp32s2.cfg"

Diff for: boards/esp32-s2-kaluga-1.json

@@ -21,6 +21,7 @@
     "openocd_target": "esp32s2.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Espressif ESP32-S2-Kaluga-1 Kit",

Diff for: boards/esp32-s2-saola-1.json

@@ -17,6 +17,7 @@
     "openocd_target": "esp32s2.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Espressif ESP32-S2-Saola-1",

Diff for: boards/esp32-s3-devkitc-1.json

@@ -0,0 +1,33 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s3_out.ld"
+    },
+    "core": "esp32",
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Espressif ESP32-S3-DevKitC-1",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 524288,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/user-guide-devkitc-1.html",
+  "vendor": "Espressif"
+}

Diff for: boards/featheresp32-s2.json

@@ -17,6 +17,7 @@
     "openocd_target": "esp32s2.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Adafruit ESP32-S2 Feather Development Board",

Diff for: builder/frameworks/_embed_files.py

@@ -108,7 +108,7 @@ def transform_to_asm(target, source, env):
             action=env.VerboseAction(
                 " ".join(
                     [
-                        "xtensa-esp32-elf-objcopy",
+                        "xtensa-%s-elf-objcopy" % board.get("build.mcu", "esp32"),
                         "--input-target",
                         "binary",
                         "--output-target",

Diff for: builder/frameworks/espidf.py

@@ -55,18 +55,13 @@
     % (
         "riscv32-esp"
         if mcu == "esp32c3"
-        else ("xtensa-esp32s2" if mcu == "esp32s2" else "xtensa-esp32")
+        else ("xtensa-%s" % mcu)
     )
 )
 
-# Legacy toolchains for mixed IDF/Arduino projects
-if "arduino" in env.subst("$PIOFRAMEWORK"):
-    TOOLCHAIN_DIR = platform.get_package_dir("toolchain-xtensa32")
-
 assert os.path.isdir(FRAMEWORK_DIR)
 assert os.path.isdir(TOOLCHAIN_DIR)
 
-# Arduino framework as a component is not compatible with ESP-IDF >=4.1
 if "arduino" in env.subst("$PIOFRAMEWORK"):
     ARDUINO_FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif32")
     # Possible package names in 'package@version' format is not compatible with CMake
@@ -233,7 +228,13 @@ def populate_idf_env_vars(idf_env):
 
     if mcu != "esp32c3":
         additional_packages.append(
-            os.path.join(platform.get_package_dir("toolchain-%sulp" % mcu), "bin"),
+            os.path.join(
+                platform.get_package_dir(
+                    "toolchain-%sulp"
+                    % ("esp32s2" if (mcu == "esp32s3" or mcu == "esp32s2") else mcu)
+                ),
+                "bin"
+              ),
         )
 
     if "windows" in get_systype():
@@ -341,7 +342,7 @@ def _add_archive(archive_path, link_args):
             if fragment.startswith("-l"):
                 link_args["LIBS"].extend(args)
             elif fragment.startswith("-L"):
-                lib_path = fragment.replace("-L", "").strip()
+                lib_path = fragment.replace("-L", "").strip().strip('"')
                 _add_to_libpath(lib_path, link_args)
             elif fragment.startswith("-") and not fragment.startswith("-l"):
                 # CMake mistakenly marks LINKFLAGS as libraries
@@ -452,20 +453,11 @@ def find_framework_service_files(search_path, sdk_config):
 
     result["lf_files"].extend(
         [
-            os.path.join(
-                FRAMEWORK_DIR,
-                "components",
-                idf_variant,
-                "ld",
-                "%s_fragments.lf" % idf_variant,
-            ),
-            os.path.join(
-                FRAMEWORK_DIR,
-                "components",
-                idf_variant,
-                "linker.lf",
-            ),
+            os.path.join(FRAMEWORK_DIR, "components", "esp_common", "common.lf"),
+            os.path.join(FRAMEWORK_DIR, "components", "esp_common", "soc.lf"),
+            os.path.join(FRAMEWORK_DIR, "components", "esp_system", "app.lf"),
             os.path.join(FRAMEWORK_DIR, "components", "newlib", "newlib.lf"),
+            os.path.join(FRAMEWORK_DIR, "components", "newlib", "system_libs.lf"),
         ]
     )
 
@@ -515,6 +507,46 @@ def generate_project_ld_script(sdk_config, ignore_targets=None):
     libraries_list = create_custom_libraries_list(
         os.path.join(BUILD_DIR, "ldgen_libraries"), ignore_targets
     )
+    # Rework the memory template linker script, following components/esp_system/ld.cmake
+    args = {
+        "preprocess" : os.path.join(
+            TOOLCHAIN_DIR,
+            "bin",
+            env.subst("$CC")),
+        "ld_output": os.path.join("$BUILD_DIR", "memory.ld"),
+        "ld_dir": os.path.join(
+            FRAMEWORK_DIR,
+            "components",
+            "esp_system",
+            "ld"),
+        "ld_input": os.path.join(
+            FRAMEWORK_DIR,
+            "components",
+            "esp_system",
+            "ld",
+            idf_variant,
+            "memory.ld.in",
+        ),
+        "config": os.path.join("$BUILD_DIR", "config"),
+        "flags" : '-C -P -x c -E -o '
+    }
+
+    cmd = (
+        '"{preprocess}" {flags} "{ld_output}" -I "{config}" -I "{ld_dir}" "{ld_input}"'
+    ).format(**args)
+
+    env.Command(
+        os.path.join("$BUILD_DIR", "memory.ld"),
+        os.path.join(
+            FRAMEWORK_DIR,
+            "components",
+            "esp_system",
+            "ld",
+            idf_variant,
+            "memory.ld.in",
+        ),
+        env.VerboseAction(cmd, "Generating memory linker script $TARGET"),
+    )
 
     args = {
         "script": os.path.join(FRAMEWORK_DIR, "tools", "ldgen", "ldgen.py"),
@@ -539,13 +571,14 @@ def generate_project_ld_script(sdk_config, ignore_targets=None):
     ).format(**args)
 
     return env.Command(
-        os.path.join("$BUILD_DIR", "%s.project.ld" % idf_variant),
+        os.path.join("$BUILD_DIR", "sections.ld"),
         os.path.join(
             FRAMEWORK_DIR,
             "components",
-            idf_variant,
+            "esp_system",
             "ld",
-            "%s.project.ld.in" % idf_variant,
+            idf_variant,
+            "sections.ld.in",
         ),
         env.VerboseAction(cmd, "Generating project linker script $TARGET"),
     )
@@ -703,6 +736,20 @@ def find_lib_deps(components_map, elf_config, link_args, ignore_components=None)
 
     return result
 
+def fix_ld_paths(extra_flags):
+    peripheral_framework_path = os.path.join(FRAMEWORK_DIR, "components", "soc", idf_variant, "ld")
+    rom_framework_path = os.path.join(FRAMEWORK_DIR, "components", "esp_rom", idf_variant, "ld")
+    bl_framework_path = os.path.join(FRAMEWORK_DIR, "components", "bootloader", "subproject", "main", "ld", idf_variant)
+
+    # ESP linker scripts changed path in ESP-IDF 4.4+, so add missing paths to linker's search path
+    try:
+        ld_index = extra_flags.index("%s.peripherals.ld" % idf_variant)
+        extra_flags[ld_index-1:ld_index-1] = [ "-L", peripheral_framework_path, "-L", rom_framework_path, "-L", bl_framework_path]
+    except:
+        print("Error while parsing the flags")
+
+    return extra_flags
+
 
 def build_bootloader():
     bootloader_src_dir = os.path.join(
@@ -747,6 +794,7 @@ def build_bootloader():
     build_components(bootloader_env, components_map, bootloader_src_dir, "bootloader")
     link_args = extract_link_args(elf_config)
     extra_flags = filter_args(link_args["LINKFLAGS"], ["-T", "-u"])
+    extra_flags = fix_ld_paths(extra_flags)
     link_args["LINKFLAGS"] = sorted(
         list(set(link_args["LINKFLAGS"]) - set(extra_flags))
     )
@@ -1061,21 +1109,23 @@ def _get_installed_pip_packages():
 
 if not board.get("build.ldscript", ""):
     linker_script = env.Command(
-        os.path.join("$BUILD_DIR", "%s_out.ld" % idf_variant),
+        os.path.join("$BUILD_DIR", "memory.ld"),
         board.get(
             "build.esp-idf.ldscript",
             os.path.join(
-                FRAMEWORK_DIR, "components", idf_variant, "ld", "%s.ld" % idf_variant
+                FRAMEWORK_DIR, "components", "esp_system", "ld", idf_variant, "memory.ld.in"
             ),
         ),
         env.VerboseAction(
-            '$CC -I"$BUILD_DIR/config" -C -P -x  c -E $SOURCE -o $TARGET',
+            '$CC -I"$BUILD_DIR/config" -I"' +
+            os.path.join(FRAMEWORK_DIR, "components", "esp_system", "ld") +
+            '" -C -P -x  c -E $SOURCE -o $TARGET',
             "Generating LD script $TARGET",
         ),
     )
 
     env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", linker_script)
-    env.Replace(LDSCRIPT_PATH="%s_out.ld" % idf_variant)
+    env.Replace(LDSCRIPT_PATH="memory.ld")
 
 #
 # Generate partition table
@@ -1257,13 +1307,15 @@ def _get_installed_pip_packages():
 # Extra flags which need to be explicitly specified in LINKFLAGS section because SCons
 # cannot merge them correctly
 extra_flags = filter_args(link_args["LINKFLAGS"], ["-T", "-u"])
+extra_flags = fix_ld_paths(extra_flags)
 link_args["LINKFLAGS"] = sorted(list(set(link_args["LINKFLAGS"]) - set(extra_flags)))
 
-# remove the main linker script flags '-T esp32_out.ld'
+# remove the main linker script flags '-T memory.ld' since it already appears later on
 try:
-    ld_index = extra_flags.index("%s_out.ld" % idf_variant)
+    ld_index = extra_flags.index("memory.ld")
     extra_flags.pop(ld_index)
     extra_flags.pop(ld_index - 1)
+    pass
 except:
     print("Warning! Couldn't find the main linker script in the CMake code model.")
 
@@ -1319,7 +1371,7 @@ def _skip_prj_source_files(node):
     FLASH_EXTRA_IMAGES=[
         (
             board.get(
-                "upload.bootloader_offset", "0x0" if mcu == "esp32c3" else "0x1000"
+                "upload.bootloader_offset", "0x0" if (mcu == "esp32c3" or mcu == "esp32s3") else "0x1000"
             ),
             os.path.join("$BUILD_DIR", "bootloader.bin"),
         ),