Skip to content

Commit 8a9d659

Browse files
committed
Merge branch 'feat/support_gdma_on_h4' into 'master'
feat(gdma): support gdma on esp32h4 Closes IDF-12382 See merge request espressif/esp-idf!38340
2 parents 57fd051 + 3d08799 commit 8a9d659

File tree

20 files changed

+1287
-352
lines changed

20 files changed

+1287
-352
lines changed

components/esp_hw_support/test_apps/dma/main/test_async_memcpy.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,19 +247,19 @@ TEST_CASE("memory copy with dest address unaligned", "[async mcp]")
247247
printf("Testing memcpy by AHB GDMA\r\n");
248248
TEST_ESP_OK(esp_async_memcpy_install_gdma_ahb(&driver_config, &driver));
249249
test_memcpy_with_dest_addr_unaligned(driver, false, false);
250-
#if SOC_AHB_GDMA_SUPPORT_PSRAM
250+
#if SOC_AHB_GDMA_SUPPORT_PSRAM && SOC_SPIRAM_SUPPORTED
251251
test_memcpy_with_dest_addr_unaligned(driver, true, true);
252-
#endif // SOC_AHB_GDMA_SUPPORT_PSRAM
252+
#endif // SOC_AHB_GDMA_SUPPORT_PSRAM && SOC_SPIRAM_SUPPORTED
253253
TEST_ESP_OK(esp_async_memcpy_uninstall(driver));
254254
#endif // SOC_AHB_GDMA_SUPPORTED
255255

256256
#if SOC_AXI_GDMA_SUPPORTED
257257
printf("Testing memcpy by AXI GDMA\r\n");
258258
TEST_ESP_OK(esp_async_memcpy_install_gdma_axi(&driver_config, &driver));
259259
test_memcpy_with_dest_addr_unaligned(driver, false, false);
260-
#if SOC_AXI_GDMA_SUPPORT_PSRAM
260+
#if SOC_AXI_GDMA_SUPPORT_PSRAM && SOC_SPIRAM_SUPPORTED
261261
test_memcpy_with_dest_addr_unaligned(driver, true, true);
262-
#endif // SOC_AXI_GDMA_SUPPORT_PSRAM
262+
#endif // SOC_AXI_GDMA_SUPPORT_PSRAM && SOC_SPIRAM_SUPPORTED
263263
TEST_ESP_OK(esp_async_memcpy_uninstall(driver));
264264
#endif // SOC_AXI_GDMA_SUPPORTED
265265
}

0 commit comments

Comments
 (0)