Merge branch 'test/add_build_test_for_esp32_psram_2t_mode' into 'master'

psram: fixed esp32 2t mode fail issue Closes IDF-6904 See merge request espressif/esp-idf!22963
espressif · Mar 31, 2023 · 4cb6f36 · 4cb6f36
2 parents 775f8e7 + 84e3d7d
commit 4cb6f36
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/components/esp_psram/esp32/esp_psram_impl_quad.c b/components/esp_psram/esp32/esp_psram_impl_quad.c
@@ -362,9 +362,7 @@ static int psram_cmd_config(psram_spi_num_t spi_num, psram_cmd_t* pInData)
         // Load send buffer
         int len = (pInData->txDataBitLen + 31) / 32;
         if (p_tx_val != NULL) {
-            for (int i = 0; i < len; i++) {
-                WRITE_PERI_REG(SPI_W0_REG(spi_num), p_tx_val[i]);
-            }
+            memcpy((void*)SPI_W0_REG(spi_num), p_tx_val, len * 4);
         }
         // Set data send buffer length.Max data length 64 bytes.
         SET_PERI_REG_BITS(SPI_MOSI_DLEN_REG(spi_num), SPI_USR_MOSI_DBITLEN, (pInData->txDataBitLen - 1),

diff --git a/components/esp_psram/test_apps/psram/pytest_psram.py b/components/esp_psram/test_apps/psram/pytest_psram.py
@@ -11,6 +11,7 @@
     'config',
     [
         'esp32_release',
+        'esp32_2t',
     ],
     indirect=True,
 )

diff --git a/components/esp_psram/test_apps/psram/sdkconfig.ci.esp32_2t b/components/esp_psram/test_apps/psram/sdkconfig.ci.esp32_2t
@@ -0,0 +1,4 @@
+CONFIG_IDF_TARGET="esp32"
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_2T_MODE=y
+CONFIG_SPIRAM_BANKSWITCH_ENABLE=n