From 615fcab94a15d240d911d1dfcfaef952fbd1d03d Mon Sep 17 00:00:00 2001 From: Sylvio Alves Date: Tue, 27 Feb 2024 00:47:39 -0300 Subject: [PATCH] samples: ipm_esp32: fix board labels and skip testing This sample code is currently not yet read for HWMv2 and sysbuild. Skip this test for now and have a fix later. Make sure sample code uses HWMv2 for board naming convention. Signed-off-by: Sylvio Alves --- samples/drivers/ipm/ipm_esp32/CMakeLists.txt | 12 ++++++------ samples/drivers/ipm/ipm_esp32/README.rst | 2 +- .../ipm/ipm_esp32/boards/esp32_devkitc_wroom.conf | 1 - ...rlay => esp32_devkitc_wroom_esp32_procpu.overlay} | 0 .../ipm/ipm_esp32/boards/esp32_devkitc_wrover.conf | 1 - ...lay => esp32_devkitc_wrover_esp32_procpu.overlay} | 0 .../ipm/ipm_esp32/boards/esp32s3_devkitm.conf | 1 - ...verlay => esp32s3_devkitm_esp32s3_procpu.overlay} | 0 ...d_esp32.overlay => yd_esp32_esp32_procpu.overlay} | 0 .../boards/esp32_devkitc_wroom_appcpu.overlay | 3 --- .../boards/esp32_devkitc_wrover_appcpu.overlay | 3 --- .../boards/esp32s3_dekvitm_appcpu.overlay | 3 --- samples/drivers/ipm/ipm_esp32/sample.yaml | 5 ++++- 13 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom.conf rename samples/drivers/ipm/ipm_esp32/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_esp32_procpu.overlay} (100%) delete mode 100644 samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover.conf rename samples/drivers/ipm/ipm_esp32/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_esp32_procpu.overlay} (100%) delete mode 100644 samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm.conf rename samples/drivers/ipm/ipm_esp32/boards/{esp32s3_devkitm.overlay => esp32s3_devkitm_esp32s3_procpu.overlay} (100%) rename samples/drivers/ipm/ipm_esp32/boards/{yd_esp32.overlay => yd_esp32_esp32_procpu.overlay} (100%) delete mode 100644 samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32_devkitc_wroom_appcpu.overlay delete mode 100644 samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32_devkitc_wrover_appcpu.overlay delete mode 100644 samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32s3_dekvitm_appcpu.overlay diff --git a/samples/drivers/ipm/ipm_esp32/CMakeLists.txt b/samples/drivers/ipm/ipm_esp32/CMakeLists.txt index 83869676324..c4399df8a92 100644 --- a/samples/drivers/ipm/ipm_esp32/CMakeLists.txt +++ b/samples/drivers/ipm/ipm_esp32/CMakeLists.txt @@ -4,12 +4,12 @@ cmake_minimum_required(VERSION 3.20.0) set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/ipm_esp32_appcpu-prefix/src/ipm_esp32_appcpu-build/zephyr) -if("${BOARD}" STREQUAL "esp32_devkitc_wrover") - set(BOARD_REMOTE "esp32_devkitc_wrover_appcpu") -elseif("${BOARD}" STREQUAL "esp32_devkitc_wroom") - set(BOARD_REMOTE "esp32_devkitc_wroom_appcpu") -elseif("${BOARD}" STREQUAL "esp32s3_devkitm") - set(BOARD_REMOTE "esp32s3_devkitm_appcpu") +if("${BOARD}" STREQUAL "esp32_devkitc_wrover/esp32/procpu") + set(BOARD_REMOTE "esp32_devkitc_wrover/esp32/appcpu") +elseif("${BOARD}" STREQUAL "esp32_devkitc_wroom/esp32/procpu") + set(BOARD_REMOTE "esp32_devkitc_wroom/esp32/appcpu") +elseif("${BOARD}" STREQUAL "esp32s3_devkitm/esp32s3/procpu") + set(BOARD_REMOTE "esp32s3_devkitm/esp32s3/appcpu") else() message(FATAL_ERROR "${BOARD} was not supported for this sample") endif() diff --git a/samples/drivers/ipm/ipm_esp32/README.rst b/samples/drivers/ipm/ipm_esp32/README.rst index 3219ee7b307..5deb498b2f9 100644 --- a/samples/drivers/ipm/ipm_esp32/README.rst +++ b/samples/drivers/ipm/ipm_esp32/README.rst @@ -26,7 +26,7 @@ Build the ESP32 IPM sample code as follows: .. zephyr-app-commands:: :zephyr-app: samples/drivers/ipm/ipm_esp32 - :board: esp32_devkitc_wroom + :board: esp32_devkitc_wroom/esp32/procpu :goals: build :compact: diff --git a/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom.conf b/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom.conf deleted file mode 100644 index 0bef3d481fd..00000000000 --- a/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SOC_ESP32_PROCPU=y diff --git a/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom.overlay b/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom_esp32_procpu.overlay similarity index 100% rename from samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom.overlay rename to samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom_esp32_procpu.overlay diff --git a/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover.conf b/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover.conf deleted file mode 100644 index 0bef3d481fd..00000000000 --- a/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SOC_ESP32_PROCPU=y diff --git a/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover.overlay b/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover_esp32_procpu.overlay similarity index 100% rename from samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover.overlay rename to samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover_esp32_procpu.overlay diff --git a/samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm.conf b/samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm.conf deleted file mode 100644 index a8ee714a955..00000000000 --- a/samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SOC_ESP32S3_PROCPU=y diff --git a/samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm.overlay b/samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm_esp32s3_procpu.overlay similarity index 100% rename from samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm.overlay rename to samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm_esp32s3_procpu.overlay diff --git a/samples/drivers/ipm/ipm_esp32/boards/yd_esp32.overlay b/samples/drivers/ipm/ipm_esp32/boards/yd_esp32_esp32_procpu.overlay similarity index 100% rename from samples/drivers/ipm/ipm_esp32/boards/yd_esp32.overlay rename to samples/drivers/ipm/ipm_esp32/boards/yd_esp32_esp32_procpu.overlay diff --git a/samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32_devkitc_wroom_appcpu.overlay b/samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32_devkitc_wroom_appcpu.overlay deleted file mode 100644 index 80f7950333f..00000000000 --- a/samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32_devkitc_wroom_appcpu.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&ipm0 { - status = "okay"; -}; diff --git a/samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32_devkitc_wrover_appcpu.overlay b/samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32_devkitc_wrover_appcpu.overlay deleted file mode 100644 index 80f7950333f..00000000000 --- a/samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32_devkitc_wrover_appcpu.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&ipm0 { - status = "okay"; -}; diff --git a/samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32s3_dekvitm_appcpu.overlay b/samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32s3_dekvitm_appcpu.overlay deleted file mode 100644 index 80f7950333f..00000000000 --- a/samples/drivers/ipm/ipm_esp32/ipm_esp_appcpu/boards/esp32s3_dekvitm_appcpu.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&ipm0 { - status = "okay"; -}; diff --git a/samples/drivers/ipm/ipm_esp32/sample.yaml b/samples/drivers/ipm/ipm_esp32/sample.yaml index 0e7384093e5..68ef394450c 100644 --- a/samples/drivers/ipm/ipm_esp32/sample.yaml +++ b/samples/drivers/ipm/ipm_esp32/sample.yaml @@ -2,7 +2,10 @@ sample: name: ESP32 IPM Sample tests: sample.ipm.ipm_esp32: - platform_allow: esp32_devkitc_wroom esp32_devkitc_wrover + platform_allow: + - esp32_devkitc_wroom/esp32/procpu + - esp32_devkitc_wrover/esp32/procpu tags: - samples - ipm + skip: true