ci(psram): enable xip psram test on h4

components/esp_psram/test_apps/.build-test-rules.yml

@@ -4,6 +4,16 @@ components/esp_psram/test_apps/psram:
   disable:
     - if: SOC_SPIRAM_SUPPORTED != 1
     - if: CONFIG_NAME == "xip_psram_no_boot_init" and SOC_SPIRAM_XIP_SUPPORTED != 1
+    - if: CONFIG_NAME == "release"  SOC_SPIRAM_XIP_SUPPORTED != 1
+    - if: IDF_TARGET in ["esp32", "esp32s2", "esp32s3", "esp32p4", "esp32h4", "esp32s31"] and CONFIG_NAME in ["release", "advanced"]
+      temporary: false
+      reason:
+        - esp32 doesn't have xip_psram
+        - esp32s2 doesn't have 120M
+        - esp32s3 needs to specify line mode
+        - esp32p4/s31 needs higher than 200/250M test
+        - esp32h4 needs 48/64M test
+
   depends_components:
     - *common_components
     - esp_psram

components/esp_psram/test_apps/psram/pytest_psram.py

@@ -90,14 +90,11 @@ def test_psram_esp32p4(dut: Dut) -> None:
 @pytest.mark.generic
 @pytest.mark.parametrize(
     'config',
-    [
-        'esp32c5_release',
-        'esp32c5_advanced',
-    ],
+    ['esp32s31_250m_release', 'esp32s31_xip'],
     indirect=True,
 )
-@idf_parametrize('target', ['esp32c5'], indirect=['target'])
-def test_psram_esp32c5(dut: Dut) -> None:
+@idf_parametrize('target', ['esp32s31'], indirect=['target'])
+def test_psram_esp32s31(dut: Dut) -> None:
     dut.run_all_single_board_cases()
 
 
@@ -105,13 +102,27 @@ def test_psram_esp32c5(dut: Dut) -> None:
 @pytest.mark.parametrize(
     'config',
     [
-        'esp32c61_release',
-        'esp32c61_advanced',
+        'esp32h4_release',
+        'esp32h4_advanced',
     ],
     indirect=True,
 )
-@idf_parametrize('target', ['esp32c61'], indirect=['target'])
-def test_psram_esp32c61(dut: Dut) -> None:
+@idf_parametrize('target', ['esp32h4'], indirect=['target'])
+def test_psram_esp32h4(dut: Dut) -> None:
+    dut.run_all_single_board_cases()
+
+
+@pytest.mark.generic
+@pytest.mark.parametrize(
+    'config',
+    [
+        'release',
+        'advanced',
+    ],
+    indirect=True,
+)
+@idf_parametrize('target', ['esp32c5', 'esp32c61'], indirect=['target'])
+def test_psram_general(dut: Dut) -> None:
     dut.run_all_single_board_cases()
 
 

components/esp_psram/test_apps/psram/sdkconfig.ci.advanced

@@ -1,5 +1,3 @@
-CONFIG_IDF_TARGET="esp32c5"
-
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y

components/esp_psram/test_apps/psram/sdkconfig.ci.esp32h4_advanced

@@ -1,14 +1,9 @@
-CONFIG_IDF_TARGET="esp32c61"
-
+CONFIG_IDF_TARGET="esp32h4"
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 
-# Flash frequency has to be 120M if SPIRAM speed is set to 120MHz
-CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
-
 CONFIG_SPIRAM=y
-CONFIG_SPIRAM_SPEED_120M=y
 CONFIG_SPIRAM_XIP_FROM_PSRAM=y
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY=y

components/esp_psram/test_apps/psram/sdkconfig.ci.esp32h4_release

@@ -1,4 +1,4 @@
-CONFIG_IDF_TARGET="esp32c5"
+CONFIG_IDF_TARGET="esp32h4"
 
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y

components/esp_psram/test_apps/psram/sdkconfig.ci.esp32s31_250m_release

@@ -0,0 +1,8 @@
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_SPEED_250M=y

components/esp_psram/test_apps/psram/sdkconfig.ci.esp32s31_xip

@@ -0,0 +1,13 @@
+CONFIG_IDF_TARGET="esp32s31"
+
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_SPEED_250M=y
+CONFIG_SPIRAM_XIP_FROM_PSRAM=y
+
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"

components/esp_psram/test_apps/psram/sdkconfig.ci.release

@@ -1,5 +1,3 @@
-CONFIG_IDF_TARGET="esp32c61"
-
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y