From 367b13e40ea72d2271291009333186aff41d36bd Mon Sep 17 00:00:00 2001 From: Sylvio Alves Date: Tue, 12 Sep 2023 10:17:11 -0300 Subject: [PATCH] samples: ipc: update esp32 board reference After esp32 board was split into several different models, rpmsg sample code was missing the change. Make esp32_devkitc_wrover the default option. (cherry picked from commit 18eff4ea0052598c98a270a97586363e893962e3) Original-Signed-off-by: Sylvio Alves GitOrigin-RevId: 18eff4ea0052598c98a270a97586363e893962e3 Change-Id: Ibaa2773582e06814612c44101396d27bbd9f240e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4896609 Tested-by: ChromeOS Prod (Robot) Reviewed-by: Al Semjonovs Commit-Queue: Al Semjonovs Tested-by: Al Semjonovs --- samples/subsys/ipc/rpmsg_service/CMakeLists.txt | 6 +++--- .../{esp32_devkitc_wroom.conf => esp32_devkitc_wrover.conf} | 0 ...2_devkitc_wroom.overlay => esp32_devkitc_wrover.overlay} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename samples/subsys/ipc/rpmsg_service/boards/{esp32_devkitc_wroom.conf => esp32_devkitc_wrover.conf} (100%) rename samples/subsys/ipc/rpmsg_service/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wrover.overlay} (100%) diff --git a/samples/subsys/ipc/rpmsg_service/CMakeLists.txt b/samples/subsys/ipc/rpmsg_service/CMakeLists.txt index 83667bb1690..7411ab59dae 100644 --- a/samples/subsys/ipc/rpmsg_service/CMakeLists.txt +++ b/samples/subsys/ipc/rpmsg_service/CMakeLists.txt @@ -18,7 +18,7 @@ elseif("${BOARD}" STREQUAL "mps2_an521") set(BOARD_REMOTE "mps2_an521_remote") elseif("${BOARD}" STREQUAL "v2m_musca_b1") set(BOARD_REMOTE "v2m_musca_b1_ns") -elseif("${BOARD}" STREQUAL "esp32") +elseif("${BOARD}" STREQUAL "esp32_devkitc_wrover") set(BOARD_REMOTE "esp32_net") elseif("${BOARD}" STREQUAL "esp32s3_devkitm") set(BOARD_REMOTE "esp32s3_devkitm_appcpu") @@ -35,7 +35,7 @@ enable_language(C ASM) target_sources(app PRIVATE src/main.c) -if("${BOARD}" STREQUAL "esp32" OR "${BOARD}" STREQUAL "esp32s3_devkitm") +if("${BOARD}" STREQUAL "esp32_devkitc_wrover" OR "${BOARD}" STREQUAL "esp32s3_devkitm") set_source_files_properties(${REMOTE_ZEPHYR_DIR}/esp32_net_firmware.c PROPERTIES GENERATED TRUE) target_sources(app PRIVATE src/main.c ${REMOTE_ZEPHYR_DIR}/esp32_net_firmware.c) endif() @@ -54,7 +54,7 @@ ExternalProject_Add( if(("${BOARD}" STREQUAL "lpcxpresso54114_m4")) add_dependencies(core_m0_inc_target rpmsg_service_remote) -elseif("${BOARD}" STREQUAL "esp32" OR "${BOARD}" STREQUAL "esp32s3_devkitm") +elseif("${BOARD}" STREQUAL "esp32_devkitc_wrover" OR "${BOARD}" STREQUAL "esp32s3_devkitm") add_dependencies(app rpmsg_service_remote) endif() diff --git a/samples/subsys/ipc/rpmsg_service/boards/esp32_devkitc_wroom.conf b/samples/subsys/ipc/rpmsg_service/boards/esp32_devkitc_wrover.conf similarity index 100% rename from samples/subsys/ipc/rpmsg_service/boards/esp32_devkitc_wroom.conf rename to samples/subsys/ipc/rpmsg_service/boards/esp32_devkitc_wrover.conf diff --git a/samples/subsys/ipc/rpmsg_service/boards/esp32_devkitc_wroom.overlay b/samples/subsys/ipc/rpmsg_service/boards/esp32_devkitc_wrover.overlay similarity index 100% rename from samples/subsys/ipc/rpmsg_service/boards/esp32_devkitc_wroom.overlay rename to samples/subsys/ipc/rpmsg_service/boards/esp32_devkitc_wrover.overlay