diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake index 477e8e407a8..b47fcfb6e1d 100644 --- a/boards/deprecated.cmake +++ b/boards/deprecated.cmake @@ -22,6 +22,9 @@ set(arduino_uno_r4_minima_DEPRECATED set(arduino_uno_r4_wifi_DEPRECATED arduino_uno_r4@wifi ) +set(esp32c6_devkitc_DEPRECATED + esp32c6_devkitc/esp32c6/hpcore +) set(qemu_xtensa_DEPRECATED qemu_xtensa/dc233c ) diff --git a/boards/espressif/esp32c6_devkitc/Kconfig b/boards/espressif/esp32c6_devkitc/Kconfig index c6a99b1032d..e24ba970a9b 100644 --- a/boards/espressif/esp32c6_devkitc/Kconfig +++ b/boards/espressif/esp32c6_devkitc/Kconfig @@ -3,4 +3,5 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD int - default 4096 + default 4096 if BOARD_ESP32C6_DEVKITC_ESP32C6_HPCORE + default 256 if BOARD_ESP32C6_DEVKITC_ESP32C6_LPCORE diff --git a/boards/espressif/esp32c6_devkitc/Kconfig.esp32c6_devkitc b/boards/espressif/esp32c6_devkitc/Kconfig.esp32c6_devkitc index 4bd1fce4efc..9b30251fea4 100644 --- a/boards/espressif/esp32c6_devkitc/Kconfig.esp32c6_devkitc +++ b/boards/espressif/esp32c6_devkitc/Kconfig.esp32c6_devkitc @@ -5,3 +5,5 @@ config BOARD_ESP32C6_DEVKITC select SOC_ESP32_C6_WROOM_1U_N8 + select SOC_ESP32C6_HPCORE if BOARD_ESP32C6_DEVKITC_ESP32C6_HPCORE + select SOC_ESP32C6_LPCORE if BOARD_ESP32C6_DEVKITC_ESP32C6_LPCORE diff --git a/boards/espressif/esp32c6_devkitc/doc/index.rst b/boards/espressif/esp32c6_devkitc/doc/index.rst index 0b1d0eaf43a..9eb73cf275b 100644 --- a/boards/espressif/esp32c6_devkitc/doc/index.rst +++ b/boards/espressif/esp32c6_devkitc/doc/index.rst @@ -147,7 +147,7 @@ To build the sample application using sysbuild use the command: .. zephyr-app-commands:: :tool: west :zephyr-app: samples/hello_world - :board: esp32c6_devkitc + :board: esp32c6_devkitc/esp32c6/hpcore :goals: build :west-args: --sysbuild :compact: @@ -196,7 +196,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: esp32c6_devkitc + :board: esp32c6_devkitc/esp32c6/hpcore :goals: build The usual ``flash`` target will work with the ``esp32c6_devkitc`` board @@ -205,7 +205,7 @@ application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: esp32c6_devkitc + :board: esp32c6_devkitc/esp32c6/hpcore :goals: flash Open the serial monitor using the following command: @@ -220,7 +220,7 @@ message in the monitor: .. code-block:: console ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx ***** - Hello World! esp32c6_devkitc + Hello World! esp32c6_devkitc/esp32c6/hpcore Debugging ********* @@ -237,7 +237,7 @@ Here is an example for building the :zephyr:code-sample:`hello_world` applicatio .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: esp32c6_devkitc + :board: esp32c6_devkitc/esp32c6/hpcore :goals: build flash :gen-args: -DOPENOCD= -DOPENOCD_DEFAULT_PATH= @@ -245,9 +245,32 @@ You can debug an application in the usual way. Here is an example for the :zephy .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: esp32c6_devkitc + :board: esp32c6_devkitc/esp32c6/hpcore :goals: debug +Low-Power CPU (LP CORE) +*********************** + +The ESP32-C6 SoC has two RISC-V cores: the High-Performance Core (HP CORE) and the Low-Power Core (LP CORE). +The LP Core features ultra low power consumption, an interrupt controller, a debug module and a system bus +interface for memory and peripheral access. + +The LP Core is in sleep mode by default. It has two application scenarios: + +- Power insensitive scenario: When the High-Performance CPU (HP Core) is active, the LP Core can assist the HP CPU with some speed and efficiency-insensitive controls and computations. +- Power sensitive scenario: When the HP CPU is in the power-down state to save power, the LP Core can be woken up to handle some external wake-up events. + +For more information, check the datasheet at `ESP32-C6 Datasheet`_ or the technical reference +manual at `ESP32-C6 Technical Reference Manual`_. + +The LP Core support is fully integrated with :ref:`sysbuild`. The user can enable the LP Core by adding +the following configuration to the project: + +.. code:: cfg + + CONFIG_ULP_COPROC_ENABLED=y + +See :zephyr:code-sample-category:`lp-core` folder as code reference. References ********** diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.dts similarity index 97% rename from boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts rename to boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.dts index 896ae30530c..de8fecdc87f 100644 --- a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts +++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.dts @@ -12,7 +12,7 @@ #include / { - model = "esp32c6_devkitc"; + model = "esp32c6_devkitc HP Core"; compatible = "espressif,esp32c6"; chosen { diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.yaml b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.yaml similarity index 73% rename from boards/espressif/esp32c6_devkitc/esp32c6_devkitc.yaml rename to boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.yaml index 9d8080c3e47..6eed11176b0 100644 --- a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.yaml +++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore.yaml @@ -1,5 +1,5 @@ -identifier: esp32c6_devkitc -name: ESP32-C6 +identifier: esp32c6_devkitc/esp32c6/hpcore +name: ESP32-C6-DevKitC HP Core vendor: espressif type: mcu arch: riscv diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_defconfig b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore_defconfig similarity index 100% rename from boards/espressif/esp32c6_devkitc/esp32c6_devkitc_defconfig rename to boards/espressif/esp32c6_devkitc/esp32c6_devkitc_hpcore_defconfig diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.dts b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.dts new file mode 100644 index 00000000000..f9aa25a41c2 --- /dev/null +++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.dts @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd. + * + * SPDX-License-Identifier: Apache-2.0 + */ +/dts-v1/; + +#include +#include + +/ { + model = "Espressif ESP32C6-DevkitC LPCORE"; + compatible = "espressif,esp32c6"; + + chosen { + zephyr,sram = &sramlp; + zephyr,code-partition = &slot0_lpcore_partition; + }; +}; diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.yaml b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.yaml new file mode 100644 index 00000000000..aabe40164d5 --- /dev/null +++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore.yaml @@ -0,0 +1,16 @@ +identifier: esp32c6_devkitc/esp32c6/lpcore +name: ESP32-C6-DevKitC LP Core +type: mcu +arch: riscv +toolchain: + - zephyr +supported: + - cpu +testing: + only_tags: + - introduction + ignore_tags: + - kernel + - posix + - chre +vendor: espressif diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore_defconfig b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore_defconfig new file mode 100644 index 00000000000..13d59f76b7d --- /dev/null +++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc_lpcore_defconfig @@ -0,0 +1,15 @@ +# Copyright (c) 2025 Espressif Systems (Shanghai) Co., Ltd. +# SPDX-License-Identifier: Apache-2.0 + +# Memory protection +CONFIG_THREAD_STACK_INFO=n +CONFIG_THREAD_CUSTOM_DATA=n + +# Boot +CONFIG_BOOT_BANNER=n + +# Console +CONFIG_PRINTK=n + +# Build +CONFIG_SIZE_OPTIMIZATIONS=y diff --git a/doc/releases/release-notes-4.2.rst b/doc/releases/release-notes-4.2.rst index 1b47130f0f8..50ecef96a30 100644 --- a/doc/releases/release-notes-4.2.rst +++ b/doc/releases/release-notes-4.2.rst @@ -70,6 +70,9 @@ Deprecated APIs and options of a new ``arduino_uno_r4`` board with revisions (``arduino_uno_r4@minima`` and ``arduino_uno_r4@wifi``). +* ``esp32c6_devkitc`` board target has been deprecated and renamed to + ``esp32c6_devkitc/esp32c6/hpcore``. + New APIs and options ==================== diff --git a/drivers/timer/Kconfig.esp32 b/drivers/timer/Kconfig.esp32 index 304ad1271b7..ff10f017866 100644 --- a/drivers/timer/Kconfig.esp32 +++ b/drivers/timer/Kconfig.esp32 @@ -5,7 +5,7 @@ config ESP32_SYS_TIMER bool "ESP32 sys-timer support (ESP32Cx series)" - depends on SOC_SERIES_ESP32C2 || SOC_SERIES_ESP32C3 || SOC_SERIES_ESP32C6 + depends on SOC_SERIES_ESP32C2 || SOC_SERIES_ESP32C3 || (SOC_SERIES_ESP32C6 && !SOC_ESP32C6_LPCORE) default y select TICKLESS_CAPABLE select TIMER_HAS_64BIT_CYCLE_COUNTER diff --git a/samples/boards/espressif/deep_sleep/boards/esp32c6_devkitc.conf b/samples/boards/espressif/deep_sleep/boards/esp32c6_devkitc_hpcore.conf similarity index 100% rename from samples/boards/espressif/deep_sleep/boards/esp32c6_devkitc.conf rename to samples/boards/espressif/deep_sleep/boards/esp32c6_devkitc_hpcore.conf diff --git a/samples/cpp/hello_world/sample.yaml b/samples/cpp/hello_world/sample.yaml index 244c7b4f345..bae5608d9a1 100644 --- a/samples/cpp/hello_world/sample.yaml +++ b/samples/cpp/hello_world/sample.yaml @@ -22,3 +22,4 @@ tests: - intel_ish_5_4_1 - intel_ish_5_6_0 - intel_ish_5_8_0 + - esp32c6_devkitc/esp32c6/lpcore diff --git a/samples/net/wifi/shell/sample.yaml b/samples/net/wifi/shell/sample.yaml index 82be44c22cc..d39379bd613 100644 --- a/samples/net/wifi/shell/sample.yaml +++ b/samples/net/wifi/shell/sample.yaml @@ -90,7 +90,7 @@ tests: - esp32c3_devkitm - esp32s3_devkitm/esp32s3/procpu - esp8684_devkitm - - esp32c6_devkitc + - esp32c6_devkitc/esp32c6/hpcore sample.net.wifi.siwx91x_offloaded: extra_args: - CONFIG_WIFI_SILABS_SIWX91X_NET_STACK_OFFLOAD=y diff --git a/samples/net/wifi/shell/socs/esp32c6.conf b/samples/net/wifi/shell/socs/esp32c6_hpcore.conf similarity index 100% rename from samples/net/wifi/shell/socs/esp32c6.conf rename to samples/net/wifi/shell/socs/esp32c6_hpcore.conf diff --git a/samples/net/wifi/shell/socs/esp32c6.overlay b/samples/net/wifi/shell/socs/esp32c6_hpcore.overlay similarity index 100% rename from samples/net/wifi/shell/socs/esp32c6.overlay rename to samples/net/wifi/shell/socs/esp32c6_hpcore.overlay diff --git a/samples/sysbuild/with_mcuboot/sample.yaml b/samples/sysbuild/with_mcuboot/sample.yaml index 2478fa9df34..0348b74dfe3 100644 --- a/samples/sysbuild/with_mcuboot/sample.yaml +++ b/samples/sysbuild/with_mcuboot/sample.yaml @@ -13,14 +13,14 @@ tests: - esp32s2_devkitc - esp32s3_devkitm/esp32s3/procpu - esp32c3_devkitm - - esp32c6_devkitc + - esp32c6_devkitc/esp32c6/hpcore integration_platforms: - nrf52840dk/nrf52840 - esp32_devkitc_wrover/esp32/procpu - esp32s2_devkitc - esp32s3_devkitm/esp32s3/procpu - esp32c3_devkitm - - esp32c6_devkitc + - esp32c6_devkitc/esp32c6/hpcore tags: mcuboot harness: console harness_config: diff --git a/soc/espressif/Kconfig.ulp b/soc/espressif/Kconfig.ulp index 6e542ad7306..55d50fc7284 100644 --- a/soc/espressif/Kconfig.ulp +++ b/soc/espressif/Kconfig.ulp @@ -5,6 +5,8 @@ menu "Ultra Low Power (ULP) Coprocessor" config ULP_COPROC_ENABLED bool "Ultra Low Power (ULP) Coprocessor" + default y if SOC_ESP32C6_LPCORE + select SOC_LATE_INIT_HOOK if SOC_ESP32C6_HPCORE help Enable this feature if you plan to use the ULP Coprocessor. Once this option is enabled, further ULP co-processor configuration will appear in the menu. diff --git a/soc/espressif/common/CMakeLists.txt b/soc/espressif/common/CMakeLists.txt index a66833a0e9b..42449a942f6 100644 --- a/soc/espressif/common/CMakeLists.txt +++ b/soc/espressif/common/CMakeLists.txt @@ -44,6 +44,8 @@ set_property(TARGET bintools PROPERTY disassembly_flag_inline_source) # Select the image origin depending on the boot configuration if(CONFIG_SOC_ESP32_APPCPU OR CONFIG_SOC_ESP32S3_APPCPU) dt_nodelabel(dts_partition_path NODELABEL "slot0_appcpu_partition") +elseif(CONFIG_SOC_ESP32C6_LPCORE) + dt_nodelabel(dts_partition_path NODELABEL "slot0_lpcore_partition") elseif(CONFIG_MCUBOOT OR CONFIG_ESP_SIMPLE_BOOT) dt_nodelabel(dts_partition_path NODELABEL "boot_partition") else() @@ -78,6 +80,8 @@ if(CONFIG_MCUBOOT) set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../${CONFIG_SOC}/mcuboot.ld CACHE INTERNAL "") elseif(CONFIG_SOC_ESP32_APPCPU OR CONFIG_SOC_ESP32S3_APPCPU) set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../${CONFIG_SOC}/default_appcpu.ld CACHE INTERNAL "") +elseif(CONFIG_SOC_ESP32C6_LPCORE) + set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../${CONFIG_SOC}/default_lpcore.ld CACHE INTERNAL "") else() set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../${CONFIG_SOC}/default.ld CACHE INTERNAL "") endif() diff --git a/soc/espressif/common/Kconfig.defconfig b/soc/espressif/common/Kconfig.defconfig index 9e33c4ff7ea..bcc34a1a52c 100644 --- a/soc/espressif/common/Kconfig.defconfig +++ b/soc/espressif/common/Kconfig.defconfig @@ -4,7 +4,7 @@ if SOC_SERIES_ESP32C2 || SOC_SERIES_ESP32C3 || SOC_SERIES_ESP32C6 config GEN_ISR_TABLES - default y + default y if !SOC_ESP32C6_LPCORE config GEN_SW_ISR_TABLE default y @@ -13,7 +13,7 @@ config GEN_IRQ_VECTOR_TABLE default n config DYNAMIC_INTERRUPTS - default y + default y if !SOC_ESP32C6_LPCORE config ISR_STACK_SIZE default 2048 diff --git a/soc/espressif/esp32c6/CMakeLists.txt b/soc/espressif/esp32c6/CMakeLists.txt index 186cf17af9b..155134b8654 100644 --- a/soc/espressif/esp32c6/CMakeLists.txt +++ b/soc/espressif/esp32c6/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -zephyr_sources( +zephyr_sources_ifdef(CONFIG_SOC_ESP32C6_HPCORE vectors.S soc_irq.S soc_irq.c @@ -8,9 +8,18 @@ zephyr_sources( ../common/loader.c ) +zephyr_sources_ifdef(CONFIG_SOC_ESP32C6_LPCORE + vector_table_lpcore.S + vectors_lpcore.S + start_lpcore.S + soc_lpcore.c + ) + zephyr_include_directories(.) -zephyr_sources_ifndef(CONFIG_BOOTLOADER_MCUBOOT hw_init.c) - -zephyr_library_sources_ifdef(CONFIG_PM power.c) -zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c) +if(CONFIG_SOC_ESP32C6_HPCORE) + zephyr_sources_ifndef(CONFIG_BOOTLOADER_MCUBOOT hw_init.c) + zephyr_library_sources_ifdef(CONFIG_PM power.c) + zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c) + zephyr_sources_ifdef(CONFIG_ULP_COPROC_ENABLED hpcore_init_ulp.c) +endif() diff --git a/soc/espressif/esp32c6/Kconfig b/soc/espressif/esp32c6/Kconfig index 3908eb4ee1e..706bbc86ac9 100644 --- a/soc/espressif/esp32c6/Kconfig +++ b/soc/espressif/esp32c6/Kconfig @@ -4,14 +4,15 @@ config SOC_SERIES_ESP32C6 select RISCV select RISCV_SOC_HAS_GP_RELATIVE_ADDRESSING - select DYNAMIC_INTERRUPTS - select CLOCK_CONTROL - select PINCTRL + select DYNAMIC_INTERRUPTS if SOC_ESP32C6_HPCORE + select CLOCK_CONTROL if SOC_ESP32C6_HPCORE + select PINCTRL if SOC_ESP32C6_HPCORE select RISCV_ISA_RV32I select RISCV_ISA_EXT_A select RISCV_ISA_EXT_M select RISCV_ISA_EXT_C select RISCV_ISA_EXT_ZICSR + select RISCV_ISA_EXT_ZIFENCEI select HAS_ESPRESSIF_HAL select HAS_PM select HAS_POWEROFF diff --git a/soc/espressif/esp32c6/Kconfig.defconfig b/soc/espressif/esp32c6/Kconfig.defconfig index 69a04a39a37..86fc3369d92 100644 --- a/soc/espressif/esp32c6/Kconfig.defconfig +++ b/soc/espressif/esp32c6/Kconfig.defconfig @@ -18,3 +18,25 @@ config MAIN_STACK_SIZE default 2048 endif # SOC_SERIES_ESP32C6 + +if SOC_ESP32C6_LPCORE + +config GEN_ISR_TABLES + default n + +config SYS_CLOCK_EXISTS + default n + +config KERNEL_MEM_POOL + default n + +config COMMON_LIBC_MALLOC_ARENA_SIZE + default 0 + +config MULTITHREADING + default n + +config NUM_PREEMPT_PRIORITIES + default 0 + +endif diff --git a/soc/espressif/esp32c6/Kconfig.soc b/soc/espressif/esp32c6/Kconfig.soc index 0fe5f8faa05..285478169f6 100644 --- a/soc/espressif/esp32c6/Kconfig.soc +++ b/soc/espressif/esp32c6/Kconfig.soc @@ -17,6 +17,16 @@ config SOC_ESP32C6 bool select SOC_SERIES_ESP32C6 +config SOC_ESP32C6_HPCORE + bool + help + This hidden configuration defines that build is targeted for HP CORE. + +config SOC_ESP32C6_LPCORE + bool + help + This hidden configuration defines that build is targeted for LP CORE. + config SOC_SERIES default "esp32c6" if SOC_SERIES_ESP32C6 diff --git a/soc/espressif/esp32c6/default.ld b/soc/espressif/esp32c6/default.ld index 6f65fecd835..981f55769b5 100644 --- a/soc/espressif/esp32c6/default.ld +++ b/soc/espressif/esp32c6/default.ld @@ -66,9 +66,13 @@ MEMORY irom0_0_seg(RX): org = IROM_SEG_ORG, len = IROM_SEG_LEN drom0_0_seg(R): org = DROM_SEG_ORG, len = DROM_SEG_LEN +#if CONFIG_ULP_COPROC_ENABLED + lp_ram_seg(RW): org = LPSRAM_IRAM_START + ULP_COPROC_RESERVE_MEM, + len = LPSRAM_SIZE - ULP_COPROC_RESERVE_MEM - CONFIG_RESERVE_RTC_MEM +#else lp_ram_seg(RW): org = LPSRAM_IRAM_START, len = 0x4000 - CONFIG_RESERVE_RTC_MEM - +#endif /* We reduced the size of lp_ram_seg by CONFIG_RESERVE_RTC_MEM value. It reserves the amount of LP memory that we use for this memory segment. This segment is intended for keeping: @@ -186,7 +190,6 @@ SECTIONS #endif /* --- START OF RTC --- */ - .rtc.text : { . = ALIGN(4); diff --git a/soc/espressif/soc.yml b/soc/espressif/soc.yml index 1ec21c88aae..cd20df8a60b 100644 --- a/soc/espressif/soc.yml +++ b/soc/espressif/soc.yml @@ -25,3 +25,6 @@ family: - name: esp32c6 socs: - name: esp32c6 + cpuclusters: + - name: hpcore + - name: lpcore diff --git a/tests/boards/espressif/rtc_clk/README.rst b/tests/boards/espressif/rtc_clk/README.rst index 8cd4853517e..48db070183c 100644 --- a/tests/boards/espressif/rtc_clk/README.rst +++ b/tests/boards/espressif/rtc_clk/README.rst @@ -14,7 +14,7 @@ Supported Boards **************** - esp32_devkitc_wrover/esp32/procpu - esp32c3_devkitm -- esp32c6_devkitc +- esp32c6_devkitc/esp32c6/hpcore - esp32s2_saola - esp32s3_devkitm/esp32s3/procpu diff --git a/tests/boards/espressif/rtc_clk/testcase.yaml b/tests/boards/espressif/rtc_clk/testcase.yaml index 5d0cb264b1c..2a13a3728f9 100644 --- a/tests/boards/espressif/rtc_clk/testcase.yaml +++ b/tests/boards/espressif/rtc_clk/testcase.yaml @@ -1,19 +1,19 @@ common: integration_platforms: - - esp32c6_devkitc + - esp32c6_devkitc/esp32c6/hpcore tests: boards.esp32.rtc_clk: platform_allow: - esp32_devkitc_wrover/esp32/procpu - esp32c3_devkitm - - esp32c6_devkitc + - esp32c6_devkitc/esp32c6/hpcore - esp32s2_saola - esp32s3_devkitm/esp32s3/procpu boards.esp32.rtc_clk.xtal: platform_allow: - esp32_devkitc_wrover/esp32/procpu - esp32c3_devkitm - - esp32c6_devkitc + - esp32c6_devkitc/esp32c6/hpcore - esp32s2_saola - esp32s3_devkitm/esp32s3/procpu harness_config: diff --git a/tests/boards/espressif/wifi/socs/esp32c6.overlay b/tests/boards/espressif/wifi/socs/esp32c6_hpcore.overlay similarity index 100% rename from tests/boards/espressif/wifi/socs/esp32c6.overlay rename to tests/boards/espressif/wifi/socs/esp32c6_hpcore.overlay diff --git a/tests/drivers/adc/adc_api/socs/esp32c6.conf b/tests/drivers/adc/adc_api/socs/esp32c6_hpcore.conf similarity index 100% rename from tests/drivers/adc/adc_api/socs/esp32c6.conf rename to tests/drivers/adc/adc_api/socs/esp32c6_hpcore.conf diff --git a/tests/drivers/adc/adc_api/socs/esp32c6.overlay b/tests/drivers/adc/adc_api/socs/esp32c6_hpcore.overlay similarity index 100% rename from tests/drivers/adc/adc_api/socs/esp32c6.overlay rename to tests/drivers/adc/adc_api/socs/esp32c6_hpcore.overlay diff --git a/tests/drivers/counter/counter_basic_api/socs/esp32c6.overlay b/tests/drivers/counter/counter_basic_api/socs/esp32c6_hpcore.overlay similarity index 100% rename from tests/drivers/counter/counter_basic_api/socs/esp32c6.overlay rename to tests/drivers/counter/counter_basic_api/socs/esp32c6_hpcore.overlay diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc.conf b/tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc_hpcore.conf similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc.conf rename to tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc_hpcore.conf diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc.overlay b/tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc_hpcore.overlay similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc.overlay rename to tests/drivers/dma/loop_transfer/boards/esp32c6_devkitc_hpcore.overlay diff --git a/tests/drivers/pwm/pwm_api/boards/esp32c6_devkitc.overlay b/tests/drivers/pwm/pwm_api/boards/esp32c6_devkitc_hpcore.overlay similarity index 100% rename from tests/drivers/pwm/pwm_api/boards/esp32c6_devkitc.overlay rename to tests/drivers/pwm/pwm_api/boards/esp32c6_devkitc_hpcore.overlay diff --git a/tests/drivers/pwm/pwm_gpio_loopback/socs/esp32c6.overlay b/tests/drivers/pwm/pwm_gpio_loopback/socs/esp32c6_hpcore.overlay similarity index 100% rename from tests/drivers/pwm/pwm_gpio_loopback/socs/esp32c6.overlay rename to tests/drivers/pwm/pwm_gpio_loopback/socs/esp32c6_hpcore.overlay diff --git a/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml b/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml index 1cc0dd5b797..45c18be499e 100644 --- a/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml +++ b/tests/drivers/pwm/pwm_gpio_loopback/testcase.yaml @@ -12,7 +12,7 @@ tests: - esp32_devkitc_wrover/esp32/procpu - esp8684_devkitm - esp32c3_devkitm - - esp32c6_devkitc + - esp32c6_devkitc/esp32c6/hpcore - esp32s2_saola - esp32s3_devkitm/esp32s3/procpu diff --git a/tests/drivers/pwm/pwm_loopback/socs/esp32c6.overlay b/tests/drivers/pwm/pwm_loopback/socs/esp32c6_hpcore.overlay similarity index 100% rename from tests/drivers/pwm/pwm_loopback/socs/esp32c6.overlay rename to tests/drivers/pwm/pwm_loopback/socs/esp32c6_hpcore.overlay diff --git a/tests/drivers/spi/spi_loopback/socs/esp32c6.conf b/tests/drivers/spi/spi_loopback/socs/esp32c6_hpcore.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/socs/esp32c6.conf rename to tests/drivers/spi/spi_loopback/socs/esp32c6_hpcore.conf diff --git a/tests/drivers/spi/spi_loopback/socs/esp32c6.overlay b/tests/drivers/spi/spi_loopback/socs/esp32c6_hpcore.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/socs/esp32c6.overlay rename to tests/drivers/spi/spi_loopback/socs/esp32c6_hpcore.overlay diff --git a/tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc.conf b/tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc_hpcore.conf similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc.conf rename to tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc_hpcore.conf diff --git a/tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc.overlay b/tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc_hpcore.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc.overlay rename to tests/drivers/uart/uart_async_api/boards/esp32c6_devkitc_hpcore.overlay diff --git a/tests/drivers/uart/uart_elementary/socs/esp32c6.overlay b/tests/drivers/uart/uart_elementary/socs/esp32c6_hpcore.overlay similarity index 100% rename from tests/drivers/uart/uart_elementary/socs/esp32c6.overlay rename to tests/drivers/uart/uart_elementary/socs/esp32c6_hpcore.overlay diff --git a/tests/drivers/uart/uart_elementary/testcase.yaml b/tests/drivers/uart/uart_elementary/testcase.yaml index cbf0327e48f..659f721d9f5 100644 --- a/tests/drivers/uart/uart_elementary/testcase.yaml +++ b/tests/drivers/uart/uart_elementary/testcase.yaml @@ -19,7 +19,7 @@ tests: - esp32_devkitc_wrover/esp32/procpu - esp8684_devkitm - esp32c3_devkitm - - esp32c6_devkitc + - esp32c6_devkitc/esp32c6/hpcore - esp32s2_saola - esp32s3_devkitm/esp32s3/procpu integration_platforms: diff --git a/west.yml b/west.yml index dca5fe32d7d..ae83c9bde54 100644 --- a/west.yml +++ b/west.yml @@ -162,7 +162,7 @@ manifest: groups: - hal - name: hal_espressif - revision: 202c59552dc98e5cd02386313e1977ecb17a131f + revision: 1892bfe6ffc859885bc2b0f2e06b6ad9ee436e6b path: modules/hal/espressif west-commands: west/west-commands.yml groups: