From 4b966ef78de889d96b2976dedfa248eb44fca5ff Mon Sep 17 00:00:00 2001
From: Armando <douyiwen@espressif.com>
Date: Tue, 19 Nov 2024 11:48:27 +0800
Subject: [PATCH] test(mspi): test 120m sdr flash 200m ddr psram on esp32p4

---
 .../test_apps/.build-test-rules.yml           |  2 +-
 .../esp_hw_support/test_apps/mspi/README.md   |  4 ++--
 .../test_apps/mspi/main/test_mspi.c           | 10 +++++++--
 .../test_apps/mspi/pytest_flash_psram.py      | 22 ++++++++++++++-----
 .../mspi/sdkconfig.ci.esp32p4_120sdr_200ddr   |  8 +++++++
 ...20sdr => sdkconfig.ci.esp32s3_f4r4_120sdr} |  2 ++
 ...> sdkconfig.ci.esp32s3_f4r4_120sdr_120sdr} |  2 ++
 ...=> sdkconfig.ci.esp32s3_f4r4_120sdr_40sdr} |  2 ++
 ...dkconfig.ci.esp32s3_f4r4_120sdr_os_silent} |  2 ++
 ...=> sdkconfig.ci.esp32s3_f4r4_40sdr_120sdr} |  2 ++
 ... => sdkconfig.ci.esp32s3_f4r4_80sdr_80sdr} |  2 ++
 ...20sdr => sdkconfig.ci.esp32s3_f4r8_120sdr} |  2 ++
 ... => sdkconfig.ci.esp32s3_f4r8_80sdr_40ddr} |  2 ++
 ... => sdkconfig.ci.esp32s3_f4r8_80sdr_80ddr} |  2 ++
 ...20sdr => sdkconfig.ci.esp32s3_f8r8_120sdr} |  2 ++
 ... => sdkconfig.ci.esp32s3_f8r8_40ddr_40ddr} |  2 ++
 ... => sdkconfig.ci.esp32s3_f8r8_40ddr_80ddr} |  2 ++
 ... => sdkconfig.ci.esp32s3_f8r8_80ddr_40ddr} |  2 ++
 ... => sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr} |  2 ++
 ...sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr_ecc} |  2 ++
 ... => sdkconfig.ci.esp32s3_f8r8_80sdr_80ddr} |  2 ++
 21 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32p4_120sdr_200ddr
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f4r4_120sdr => sdkconfig.ci.esp32s3_f4r4_120sdr} (91%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f4r4_120sdr_120sdr => sdkconfig.ci.esp32s3_f4r4_120sdr_120sdr} (92%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f4r4_120sdr_40sdr => sdkconfig.ci.esp32s3_f4r4_120sdr_40sdr} (92%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f4r4_120sdr_os_silent => sdkconfig.ci.esp32s3_f4r4_120sdr_os_silent} (94%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f4r4_40sdr_120sdr => sdkconfig.ci.esp32s3_f4r4_40sdr_120sdr} (90%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f4r4_80sdr_80sdr => sdkconfig.ci.esp32s3_f4r4_80sdr_80sdr} (90%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f4r8_120sdr => sdkconfig.ci.esp32s3_f4r8_120sdr} (91%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f4r8_80sdr_40ddr => sdkconfig.ci.esp32s3_f4r8_80sdr_40ddr} (91%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f4r8_80sdr_80ddr => sdkconfig.ci.esp32s3_f4r8_80sdr_80ddr} (91%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f8r8_120sdr => sdkconfig.ci.esp32s3_f8r8_120sdr} (92%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f8r8_40ddr_40ddr => sdkconfig.ci.esp32s3_f8r8_40ddr_40ddr} (93%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f8r8_40ddr_80ddr => sdkconfig.ci.esp32s3_f8r8_40ddr_80ddr} (93%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f8r8_80ddr_40ddr => sdkconfig.ci.esp32s3_f8r8_80ddr_40ddr} (93%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f8r8_80ddr_80ddr => sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr} (93%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f8r8_80ddr_80ddr_ecc => sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr_ecc} (93%)
 rename components/esp_hw_support/test_apps/mspi/{sdkconfig.ci.f8r8_80sdr_80ddr => sdkconfig.ci.esp32s3_f8r8_80sdr_80ddr} (93%)

diff --git a/components/esp_hw_support/test_apps/.build-test-rules.yml b/components/esp_hw_support/test_apps/.build-test-rules.yml
index 0585429eba..1b086d9f03 100644
--- a/components/esp_hw_support/test_apps/.build-test-rules.yml
+++ b/components/esp_hw_support/test_apps/.build-test-rules.yml
@@ -20,7 +20,7 @@ components/esp_hw_support/test_apps/host_test_linux:
 
 components/esp_hw_support/test_apps/mspi:
   disable:
-    - if: IDF_TARGET != "esp32s3"
+    - if: IDF_TARGET not in ["esp32s3", "esp32p4"]
 
 components/esp_hw_support/test_apps/mspi_psram_with_dfs:
   disable:
diff --git a/components/esp_hw_support/test_apps/mspi/README.md b/components/esp_hw_support/test_apps/mspi/README.md
index 3677101481..3a9d77fcb9 100644
--- a/components/esp_hw_support/test_apps/mspi/README.md
+++ b/components/esp_hw_support/test_apps/mspi/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32-S3 |
-| ----------------- | -------- |
+| Supported Targets | ESP32-P4 | ESP32-S3 |
+| ----------------- | -------- | -------- |
 
 This project tests if Flash and PSRAM can work under different configurations.
 To add new configuration, create one more sdkconfig.ci.NAME file in this directory.
diff --git a/components/esp_hw_support/test_apps/mspi/main/test_mspi.c b/components/esp_hw_support/test_apps/mspi/main/test_mspi.c
index 542f13798f..c6436535b6 100644
--- a/components/esp_hw_support/test_apps/mspi/main/test_mspi.c
+++ b/components/esp_hw_support/test_apps/mspi/main/test_mspi.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: Unlicense OR CC0-1.0
  */
@@ -22,9 +22,15 @@ static void sorted_array_insert(uint32_t *array, uint32_t *size, uint32_t item)
     (*size)++;
 }
 
+#if CONFIG_IDF_TARGET_ESP32S3
 #define TEST_TIME_CNT           10
 #define TEST_TIME_LIMIT_US      10
-TEST_CASE("MSPI: Test mspi timing turning time cost", "[mspi]")
+#elif CONFIG_IDF_TARGET_ESP32P4
+#define TEST_TIME_CNT           30
+#define TEST_TIME_LIMIT_US      30
+#endif
+
+TEST_CASE("MSPI: Test mspi timing tuning time cost", "[mspi]")
 {
     uint64_t start, end;
     uint32_t cost, index_1 = 0, index_2 = 0;
diff --git a/components/esp_hw_support/test_apps/mspi/pytest_flash_psram.py b/components/esp_hw_support/test_apps/mspi/pytest_flash_psram.py
index b0284ea421..7132d7f0b6 100644
--- a/components/esp_hw_support/test_apps/mspi/pytest_flash_psram.py
+++ b/components/esp_hw_support/test_apps/mspi/pytest_flash_psram.py
@@ -1,13 +1,12 @@
-# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
-
 import os
 import pathlib
 
 import pytest
 from pytest_embedded_idf import IdfDut
 
-MSPI_F8R8_configs = [p.name.replace('sdkconfig.ci.', '') for p in pathlib.Path(os.path.dirname(__file__)).glob('sdkconfig.ci.f8r8*')]
+MSPI_F8R8_configs = [p.name.replace('sdkconfig.ci.', '') for p in pathlib.Path(os.path.dirname(__file__)).glob('sdkconfig.ci.esp32s3_f8r8*')]
 
 
 @pytest.mark.esp32s3
@@ -18,7 +17,7 @@ def test_flash8_psram8(dut: IdfDut) -> None:
 
 
 # For F4R8 board (Quad Flash and Octal PSRAM)
-MSPI_F4R8_configs = [p.name.replace('sdkconfig.ci.', '') for p in pathlib.Path(os.path.dirname(__file__)).glob('sdkconfig.ci.f4r8*')]
+MSPI_F4R8_configs = [p.name.replace('sdkconfig.ci.', '') for p in pathlib.Path(os.path.dirname(__file__)).glob('sdkconfig.ci.esp32s3_f4r8*')]
 
 
 @pytest.mark.esp32s3
@@ -29,7 +28,7 @@ def test_flash4_psram8(dut: IdfDut) -> None:
 
 
 # For F4R4 board (Quad Flash and Quad PSRAM)
-MSPI_F4R4_configs = [p.name.replace('sdkconfig.ci.', '') for p in pathlib.Path(os.path.dirname(__file__)).glob('sdkconfig.ci.f4r4*')]
+MSPI_F4R4_configs = [p.name.replace('sdkconfig.ci.', '') for p in pathlib.Path(os.path.dirname(__file__)).glob('sdkconfig.ci.esp32s3_f4r4*')]
 
 
 @pytest.mark.esp32s3
@@ -37,3 +36,16 @@ MSPI_F4R4_configs = [p.name.replace('sdkconfig.ci.', '') for p in pathlib.Path(o
 @pytest.mark.parametrize('config', MSPI_F4R4_configs, indirect=True)
 def test_flash4_psram4(dut: IdfDut) -> None:
     dut.run_all_single_board_cases()
+
+
+@pytest.mark.esp32p4
+@pytest.mark.generic
+@pytest.mark.parametrize(
+    'config',
+    [
+        'esp32p4_120sdr_200ddr',
+    ],
+    indirect=True,
+)
+def test_flash_psram_esp32p4(dut: IdfDut) -> None:
+    dut.run_all_single_board_cases()
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32p4_120sdr_200ddr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32p4_120sdr_200ddr
new file mode 100644
index 0000000000..53d90195c1
--- /dev/null
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32p4_120sdr_200ddr
@@ -0,0 +1,8 @@
+CONFIG_IDF_TARGET="esp32p4"
+
+CONFIG_IDF_EXPERIMENTAL_FEATURES=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_SPEED_200M=y
+CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
+CONFIG_SPI_FLASH_HPM_ENA=y
+CONFIG_BOOTLOADER_FLASH_DC_AWARE=y
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr
similarity index 91%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr
index 3ce4e3c454..43112d79f7 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr
@@ -1,5 +1,7 @@
 # Legacy, F4R4, Flash 120M SDR, PSRAM disable
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr_120sdr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr_120sdr
similarity index 92%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr_120sdr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr_120sdr
index c05d0bbab3..b3c8da70c5 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr_120sdr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr_120sdr
@@ -1,5 +1,7 @@
 # Legacy, F4R4, Flash 120M SDR, PSRAM 120M SDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr_40sdr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr_40sdr
similarity index 92%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr_40sdr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr_40sdr
index 60dacd89a4..0bfc80eb55 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr_40sdr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr_40sdr
@@ -1,5 +1,7 @@
 # Legacy, F4R4, Flash 120M SDR, PSRAM 40M SDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr_os_silent b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr_os_silent
similarity index 94%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr_os_silent
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr_os_silent
index da05ca4710..e7f2806be3 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_120sdr_os_silent
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_120sdr_os_silent
@@ -1,5 +1,7 @@
 # Legacy, F4R4, Flash 120M SDR, PSRAM disable, compiler -Os and silent
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_40sdr_120sdr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_40sdr_120sdr
similarity index 90%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_40sdr_120sdr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_40sdr_120sdr
index 7a1d6cb5c9..a2c2b3c7af 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_40sdr_120sdr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_40sdr_120sdr
@@ -1,5 +1,7 @@
 # Legacy, F4R4, Flash 40M SDR, PSRAM 120M SDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_80sdr_80sdr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_80sdr_80sdr
similarity index 90%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_80sdr_80sdr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_80sdr_80sdr
index 466aa5a33d..caa6d0d5f9 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r4_80sdr_80sdr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r4_80sdr_80sdr
@@ -1,5 +1,7 @@
 # Legacy, F4R4, Flash 80M SDR, PSRAM 80M SDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r8_120sdr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r8_120sdr
similarity index 91%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r8_120sdr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r8_120sdr
index 03b2c9106c..e97b11c2f5 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r8_120sdr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r8_120sdr
@@ -1,5 +1,7 @@
 # Legacy, F4R8, Flash 120M SDR, PSRAM disable
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r8_80sdr_40ddr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r8_80sdr_40ddr
similarity index 91%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r8_80sdr_40ddr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r8_80sdr_40ddr
index 72baf2d0e1..39fa591acd 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r8_80sdr_40ddr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r8_80sdr_40ddr
@@ -1,5 +1,7 @@
 # Legacy, F4R8, Flash 80M SDR, PSRAM 40M DDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r8_80sdr_80ddr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r8_80sdr_80ddr
similarity index 91%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r8_80sdr_80ddr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r8_80sdr_80ddr
index 59434041a7..096f83be00 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f4r8_80sdr_80ddr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f4r8_80sdr_80ddr
@@ -1,5 +1,7 @@
 # Legacy, F4R8, Flash 80M SDR, PSRAM 80M DDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_120sdr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_120sdr
similarity index 92%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_120sdr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_120sdr
index 774de2b9da..d8e2a43d36 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_120sdr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_120sdr
@@ -1,5 +1,7 @@
 # Legacy, F8R8, Flash 120M SDR, PSRAM disable
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_40ddr_40ddr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_40ddr_40ddr
similarity index 93%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_40ddr_40ddr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_40ddr_40ddr
index 0643c26397..95391e53b6 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_40ddr_40ddr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_40ddr_40ddr
@@ -1,5 +1,7 @@
 # Legacy, F8R8, Flash 40M DDR, PSRAM 40M DDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_40ddr_80ddr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_40ddr_80ddr
similarity index 93%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_40ddr_80ddr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_40ddr_80ddr
index e208933fbb..5661b6e7a7 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_40ddr_80ddr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_40ddr_80ddr
@@ -1,5 +1,7 @@
 # Legacy, F8R8, Flash 40M DDR, PSRAM 80M DDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80ddr_40ddr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80ddr_40ddr
similarity index 93%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80ddr_40ddr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80ddr_40ddr
index c56905ccb0..2ea74b405a 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80ddr_40ddr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80ddr_40ddr
@@ -1,5 +1,7 @@
 # Legacy, F8R8, Flash 80M DDR, PSRAM 40M DDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80ddr_80ddr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr
similarity index 93%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80ddr_80ddr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr
index 022bd0a12d..d174070fc6 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80ddr_80ddr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr
@@ -1,5 +1,7 @@
 # Legacy, F8R8, Flash 80M DDR, PSRAM 80M DDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80ddr_80ddr_ecc b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr_ecc
similarity index 93%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80ddr_80ddr_ecc
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr_ecc
index 7ab1d4bcfe..29d6f0ec20 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80ddr_80ddr_ecc
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80ddr_80ddr_ecc
@@ -1,5 +1,7 @@
 # Legacy, F8R8, Flash 80M DDR, PSRAM 80M DDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
diff --git a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80sdr_80ddr b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80sdr_80ddr
similarity index 93%
rename from components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80sdr_80ddr
rename to components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80sdr_80ddr
index ffb1487d21..fa6e52f5f0 100644
--- a/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.f8r8_80sdr_80ddr
+++ b/components/esp_hw_support/test_apps/mspi/sdkconfig.ci.esp32s3_f8r8_80sdr_80ddr
@@ -1,5 +1,7 @@
 # Legacy, F8R8, Flash 80M SDR, PSRAM 80M DDR
 
+CONFIG_IDF_TARGET="esp32s3"
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"