feat(elf_loader): Add ESP32-C6 support

Author: cwespressif

.gitlab/ci/build.yml

@@ -1344,6 +1344,7 @@ build_example_elf_loader_build_elf_file_example:
       - IMAGE: espressif/idf:release-v5.1
       - IMAGE: espressif/idf:release-v5.2
       - IMAGE: espressif/idf:release-v5.3
+      - IMAGE: espressif/idf:release-v5.4
   variables:
     EXAMPLE_DIR: examples/elf_loader/build_elf_file_example
 

components/elf_loader/Kconfig

@@ -1,15 +1,15 @@
 menu "Espressif ELF Loader Configuration"
-    visible if (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4)
+    visible if (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4)
 
     config ELF_LOADER_BUS_ADDRESS_MIRROR
         bool
         default y if (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3)
-        default n if IDF_TARGET_ESP32P4
+        default n if (IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4)
 
     config ELF_LOADER
         bool "Enable Espressif ELF Loader"
         default y
-        depends on (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4)
+        depends on (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4)
         help
             Select this option to enable ELF Loader and show the submenu with ELF Loader configuration choices.
 

components/elf_loader/README.md

@@ -12,6 +12,7 @@ This ELF loader supports following SoCs:
 - ESP32-S2, support running ELF in PSRAM
 - ESP32-S3, support running ELF in PSRAM
 - ESP32-P4, support running ELF in PSRAM
+- ESP32-C6
 
 ### Usage
 

components/elf_loader/elf_loader.cmake

@@ -37,7 +37,6 @@ macro(project_elf project_name)
     set(strip_flags --strip-unneeded
                     --remove-section=.comment
                     --remove-section=.got.loc
-                    --remove-section=.got
                     --remove-section=.dynamic)
 
     if(CONFIG_IDF_TARGET_ARCH_XTENSA)

components/elf_loader/src/arch/esp_elf_riscv.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/elf_loader/src/arch/esp_elf_xtensa.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/elf_loader/src/esp_elf_adapter.c

@@ -38,9 +38,12 @@ void *esp_elf_malloc(uint32_t n, bool exec)
 #endif
 #else
 #ifdef CONFIG_ELF_LOADER_LOAD_PSRAM
-    caps = MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT | MALLOC_CAP_CACHE_ALIGNED;
+    caps = MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT;
 #else
-    caps = MALLOC_CAP_8BIT | MALLOC_CAP_CACHE_ALIGNED;
+    caps = MALLOC_CAP_8BIT;
+#endif
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+    caps |= MALLOC_CAP_CACHE_ALIGNED;
 #endif
 #endif
 

examples/.build-rules.yml

@@ -362,8 +362,10 @@ examples/elf_loader/elf_loader_example:
   enable:
     - if: IDF_TARGET in ["esp32","esp32s2","esp32s3"]
     - if: IDF_TARGET in ["esp32p4"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 3)
+    - if: IDF_TARGET in ["esp32c6"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 1)
 
 examples/elf_loader/build_elf_file_example:
   enable:
     - if: IDF_TARGET in ["esp32","esp32s2","esp32s3"]
     - if: IDF_TARGET in ["esp32p4"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 3)
+    - if: IDF_TARGET in ["esp32c6"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 1)

examples/elf_loader/build_elf_file_example/README.md

@@ -6,8 +6,8 @@ This example shows how to build ELF file.
 
 Before project configuration and build, be sure to set the correct chip target using `idf.py set-target <chip_name>`.
 
-* Note: Only ESP32, ESP32-S2, ESP32-S3 and ESP32-P4 are supported
+* Note: Only ESP32, ESP32-S2, ESP32-S3, ESP32-C6 and ESP32-P4 are supported
 
 ### Build and Flash
 
-Run `idf.py build` to build project, and when compiling is done you can see `hello_world.app.elf` in `build` directory.
+Run `idf.py elf` to build project, and when compiling is done you can see `hello_world.app.elf` in `build` directory.

examples/elf_loader/elf_loader_example/README.md

@@ -10,7 +10,7 @@ Before project configuration and build, be sure to set the correct chip target u
 
 ### Hardware Required
 
-* A development board based on espressif ESP32/ESP32-S2/ESP32-S3/ESP32-P4 SoC
+* A development board based on espressif ESP32/ESP32-S2/ESP32-S3/ESP32-C6/ESP32-P4 SoC
 * A USB cable for power supply and programming
 
 ### Configure the Project