Skip to content

Commit 09fe2f7

Browse files
committed
Merge branch 'feature/add_esp32c61_support' into 'master'
feat(elf_loader): Add ESP32-C61 support Closes AEG-2545 See merge request ae_group/esp-iot-solution!1337
2 parents 50a4ae8 + 2e8ca87 commit 09fe2f7

File tree

9 files changed

+25
-8
lines changed

9 files changed

+25
-8
lines changed

.gitlab/ci/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,6 +1810,7 @@ build_example_elf_loader_elf_loader_example:
18101810
- IMAGE: espressif/idf:release-v5.2
18111811
- IMAGE: espressif/idf:release-v5.3
18121812
- IMAGE: espressif/idf:release-v5.4
1813+
- IMAGE: espressif/idf:release-v5.5
18131814
EXAMPLE_CONFIG: "sdkconfig.ci=default"
18141815
variables:
18151816
EXAMPLE_DIR: examples/elf_loader/elf_loader_example
@@ -1826,6 +1827,7 @@ build_example_elf_loader_build_elf_file_example:
18261827
- IMAGE: espressif/idf:release-v5.2
18271828
- IMAGE: espressif/idf:release-v5.3
18281829
- IMAGE: espressif/idf:release-v5.4
1830+
- IMAGE: espressif/idf:release-v5.5
18291831
variables:
18301832
EXAMPLE_DIR: examples/elf_loader/build_elf_file_example
18311833

components/elf_loader/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ChangeLog
22

3+
## v1.1.1 - 2025-06-26
4+
5+
* Added support for ESP32-C61
6+
37
## v1.1.0 - 2025-05-06
48

59
* Added fast build for ELF application

components/elf_loader/Kconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
menu "Espressif ELF Loader Configuration"
2-
visible if (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4)
2+
visible if (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 || IDF_TARGET_ESP32C61)
33

44
config ELF_LOADER_BUS_ADDRESS_MIRROR
55
bool
66
default y if (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3)
7-
default n if (IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4)
7+
default n if (IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 || IDF_TARGET_ESP32C61)
88

99
config ELF_LOADER
1010
bool "Enable Espressif ELF Loader"
1111
default y
12-
depends on (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4)
12+
depends on (IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 || IDF_TARGET_ESP32C61)
1313
help
1414
Select this option to enable ELF Loader and show the submenu with ELF Loader configuration choices.
1515

@@ -29,7 +29,7 @@ menu "Espressif ELF Loader Configuration"
2929
config ELF_LOADER_LOAD_PSRAM
3030
bool "Load ELF to PSRAM"
3131
default y
32-
depends on (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4) && SPIRAM
32+
depends on (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4 || IDF_TARGET_ESP32C61) && SPIRAM
3333
select ELF_LOADER_CACHE_OFFSET if (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3)
3434
select ELF_LOADER_SET_MMU if IDF_TARGET_ESP32S2
3535
help

components/elf_loader/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This ELF loader supports following SoCs:
1313
- ESP32-S3, support running ELF in PSRAM
1414
- ESP32-P4, support running ELF in PSRAM
1515
- ESP32-C6
16+
- ESP32-C61, support running ELF in PSRAM
1617

1718
### Usage
1819

components/elf_loader/idf_component.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
version: "1.1.0"
1+
version: "1.1.1"
2+
targets:
3+
- esp32
4+
- esp32s2
5+
- esp32s3
6+
- esp32c6
7+
- esp32c61
8+
- esp32p4
29
description: Espressif ELF(Executable and Linkable Format) Loader
310
url: https://github.com/espressif/esp-iot-solution/tree/master/components/elf_loader
411
dependencies:

examples/.build-rules.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,12 +481,14 @@ examples/elf_loader/elf_loader_example:
481481
- if: IDF_TARGET in ["esp32","esp32s2","esp32s3"]
482482
- if: IDF_TARGET in ["esp32p4"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 3)
483483
- if: IDF_TARGET in ["esp32c6"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 1)
484+
- if: IDF_TARGET in ["esp32c61"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 5 and IDF_VERSION_PATCH >= 1)
484485

485486
examples/elf_loader/build_elf_file_example:
486487
enable:
487488
- if: IDF_TARGET in ["esp32","esp32s2","esp32s3"]
488489
- if: IDF_TARGET in ["esp32p4"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 3)
489490
- if: IDF_TARGET in ["esp32c6"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 1)
491+
- if: IDF_TARGET in ["esp32c61"] and (IDF_VERSION_MAJOR >= 5 and IDF_VERSION_MINOR >= 5 and IDF_VERSION_PATCH >= 1)
490492

491493
examples/relinker:
492494
enable:

examples/elf_loader/build_elf_file_example/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This example shows how to build ELF file.
66

77
Before project configuration and build, be sure to set the correct chip target using `idf.py set-target <chip_name>`.
88

9-
* Note: Only ESP32, ESP32-S2, ESP32-S3, ESP32-C6 and ESP32-P4 are supported
9+
* Note: Only ESP32, ESP32-S2, ESP32-S3, ESP32-C6, ESP32-C61 and ESP32-P4 are supported
1010

1111
### Build and Flash
1212

examples/elf_loader/elf_loader_example/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ This example shows how to use ELF loader to run ELF file.
66

77
Before project configuration and build, be sure to set the correct chip target using `idf.py set-target <chip_name>`.
88

9-
* Note: Only ESP32, ESP32-S2, ESP32-S3 and ESP32-P4 are supported
9+
* Note: Only ESP32, ESP32-S2, ESP32-S3, ESP32-C6, ESP32-C61 and ESP32-P4 are supported
1010

1111
### Hardware Required
1212

13-
* A development board based on espressif ESP32/ESP32-S2/ESP32-S3/ESP32-C6/ESP32-P4 SoC
13+
* A development board based on espressif ESP32/ESP32-S2/ESP32-S3/ESP32-C6/ESP32-C61/ESP32-P4 SoC
1414
* A USB cable for power supply and programming
1515

1616
### Configure the Project

examples/elf_loader/elf_loader_example/main/idf_component.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ targets:
33
- esp32s2
44
- esp32s3
55
- esp32c6
6+
- esp32c61
67
- esp32p4
78
dependencies:
89
elf_loader:

0 commit comments

Comments
 (0)