From 2a8459b05993a145c75bb8e52ae12e622ce80e4f Mon Sep 17 00:00:00 2001
From: Armando <douyiwen@espressif.com>
Date: Thu, 11 Jan 2024 18:30:24 +0800
Subject: [PATCH 1/2] ci(psram): enable psram test on p4

---
 .../esp_psram/test_apps/.build-test-rules.yml |  5 ++--
 .../esp_psram/test_apps/psram/README.md       |  4 +--
 .../esp_psram/test_apps/psram/pytest_psram.py | 25 ++++++++++++++-----
 .../psram/sdkconfig.ci.esp32p4_200m_release   |  9 +++++++
 4 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 components/esp_psram/test_apps/psram/sdkconfig.ci.esp32p4_200m_release

diff --git a/components/esp_psram/test_apps/.build-test-rules.yml b/components/esp_psram/test_apps/.build-test-rules.yml
index 80b8ef4fe3..b401be9e4d 100644
--- a/components/esp_psram/test_apps/.build-test-rules.yml
+++ b/components/esp_psram/test_apps/.build-test-rules.yml
@@ -1,6 +1,5 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
 components/esp_psram/test_apps:
-  enable:
-    - if: IDF_TARGET in ["esp32", "esp32s2", "esp32s3"]
-      reason: only test on esp32, esp32s2, and esp32s3
+  disable:
+    - if: SOC_SPIRAM_SUPPORTED != 1
diff --git a/components/esp_psram/test_apps/psram/README.md b/components/esp_psram/test_apps/psram/README.md
index 3c1295ae25..7951ad1f13 100644
--- a/components/esp_psram/test_apps/psram/README.md
+++ b/components/esp_psram/test_apps/psram/README.md
@@ -1,4 +1,4 @@
-| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- |
 
 This test app is used to test PSRAM
diff --git a/components/esp_psram/test_apps/psram/pytest_psram.py b/components/esp_psram/test_apps/psram/pytest_psram.py
index e086f7f27f..7ceb29e7fb 100644
--- a/components/esp_psram/test_apps/psram/pytest_psram.py
+++ b/components/esp_psram/test_apps/psram/pytest_psram.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: CC0-1.0
 
 import pytest
@@ -19,6 +19,20 @@ def test_psram_esp32(dut: Dut) -> None:
     dut.run_all_single_board_cases()
 
 
+@pytest.mark.esp32
+@pytest.mark.psramv0
+@pytest.mark.parametrize(
+    'config',
+    [
+        'esp32_hspi',
+        'esp32_vspi',
+    ],
+    indirect=True,
+)
+def test_psram_esp32_psramv0(dut: Dut) -> None:
+    dut.run_all_single_board_cases()
+
+
 @pytest.mark.esp32s2
 @pytest.mark.generic
 @pytest.mark.parametrize(
@@ -61,15 +75,14 @@ def test_psram_esp32s3_octal(dut: Dut) -> None:
     dut.run_all_single_board_cases()
 
 
-@pytest.mark.esp32
-@pytest.mark.psramv0
+@pytest.mark.esp32p4
+@pytest.mark.generic
 @pytest.mark.parametrize(
     'config',
     [
-        'esp32_hspi',
-        'esp32_vspi',
+        'esp32p4_200m_release',
     ],
     indirect=True,
 )
-def test_psram_esp32_psramv0(dut: Dut) -> None:
+def test_psram_esp32p4(dut: Dut) -> None:
     dut.run_all_single_board_cases()
diff --git a/components/esp_psram/test_apps/psram/sdkconfig.ci.esp32p4_200m_release b/components/esp_psram/test_apps/psram/sdkconfig.ci.esp32p4_200m_release
new file mode 100644
index 0000000000..97965c1926
--- /dev/null
+++ b/components/esp_psram/test_apps/psram/sdkconfig.ci.esp32p4_200m_release
@@ -0,0 +1,9 @@
+CONFIG_IDF_TARGET="esp32p4"
+
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+
+CONFIG_SPIRAM=y
+CONFIG_IDF_EXPERIMENTAL_FEATURES=y
+CONFIG_SPIRAM_SPEED_200M=y

From 96f1853cd09d8406aa8f27ebbe4310c59b0990b6 Mon Sep 17 00:00:00 2001
From: Armando <douyiwen@espressif.com>
Date: Thu, 11 Jan 2024 18:34:29 +0800
Subject: [PATCH 2/2] ci(psram): added esp_psram test dependency

---
 components/esp_psram/test_apps/.build-test-rules.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/esp_psram/test_apps/.build-test-rules.yml b/components/esp_psram/test_apps/.build-test-rules.yml
index b401be9e4d..116c563dcd 100644
--- a/components/esp_psram/test_apps/.build-test-rules.yml
+++ b/components/esp_psram/test_apps/.build-test-rules.yml
@@ -3,3 +3,9 @@
 components/esp_psram/test_apps:
   disable:
     - if: SOC_SPIRAM_SUPPORTED != 1
+  depends_components:
+    - esp_psram
+    - esp_mm
+    - esp_driver_gpio
+    - esp_driver_spi
+    - spi_flash