From e8e58f57a8d60818750bc037f7fa16ffd11cec98 Mon Sep 17 00:00:00 2001 From: Jiang Guang Ming Date: Sun, 26 Mar 2023 23:59:24 -0700 Subject: [PATCH 1/2] spi_flash: support flash mmap pytest on C6 and H2 --- components/spi_flash/.build-test-rules.yml | 6 ------ components/spi_flash/test_apps/flash_mmap/README.md | 4 ++-- .../spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py | 3 ++- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/components/spi_flash/.build-test-rules.yml b/components/spi_flash/.build-test-rules.yml index 89ee01ae91..6f208cb0ab 100644 --- a/components/spi_flash/.build-test-rules.yml +++ b/components/spi_flash/.build-test-rules.yml @@ -11,9 +11,3 @@ components/spi_flash/test_apps/flash_encryption: - if: IDF_TARGET in ["esp32c2", "esp32s2", "esp32c6", "esp32h2"] temporary: true reason: No runners # IDF-5634 - -components/spi_flash/test_apps/flash_mmap: - disable: - - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2" - temporary: true - reason: target esp32c6, esp32h2 is not supported yet diff --git a/components/spi_flash/test_apps/flash_mmap/README.md b/components/spi_flash/test_apps/flash_mmap/README.md index b5be4985c5..a8b7833fa3 100644 --- a/components/spi_flash/test_apps/flash_mmap/README.md +++ b/components/spi_flash/test_apps/flash_mmap/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py b/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py index ce5fb64224..0523bcf537 100644 --- a/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py +++ b/components/spi_flash/test_apps/flash_mmap/pytest_flash_mmap.py @@ -6,7 +6,6 @@ from pytest_embedded import Dut @pytest.mark.supported_targets -@pytest.mark.temp_skip_ci(targets=['esp32c6', 'esp32h2'], reason='c6/h2 support TBD') @pytest.mark.generic @pytest.mark.parametrize( 'config', @@ -22,6 +21,8 @@ def test_flash_mmap(dut: Dut) -> None: @pytest.mark.esp32s3 @pytest.mark.esp32c3 @pytest.mark.esp32c2 +@pytest.mark.esp32c6 +@pytest.mark.esp32h2 @pytest.mark.generic @pytest.mark.parametrize( 'config', From a06afc8d91c91633bca4f1d95434fe640fe5d72e Mon Sep 17 00:00:00 2001 From: Jiang Guang Ming Date: Mon, 27 Mar 2023 00:29:51 -0700 Subject: [PATCH 2/2] doc: remove `esp32h2 or esp32c6: - Flash MMAP driver isn't ready in Chip-ROM` --- .../api-reference/peripherals/spi_flash/spi_flash_idf_vs_rom.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/en/api-reference/peripherals/spi_flash/spi_flash_idf_vs_rom.rst b/docs/en/api-reference/peripherals/spi_flash/spi_flash_idf_vs_rom.rst index a51d0315d6..6b23d7f140 100644 --- a/docs/en/api-reference/peripherals/spi_flash/spi_flash_idf_vs_rom.rst +++ b/docs/en/api-reference/peripherals/spi_flash/spi_flash_idf_vs_rom.rst @@ -20,7 +20,6 @@ Feature Supported by ESP-IDF but not in Chip-ROM - :ref:`CONFIG_SPI_FLASH_LOG_FAILED_WRITE`, enabling this option will print the bad writing. - :ref:`CONFIG_SPI_FLASH_WARN_SETTING_ZERO_TO_ONE`, enabling this option will check if you're writing zero to one. - :ref:`CONFIG_SPI_FLASH_DANGEROUS_WRITE`, enabling this option will check for flash programming to certain protected regions like bootloader, partition table or application itself. - :esp32h2 or esp32c6: - Flash MMAP driver isn't ready in Chip-ROM. Bugfixes Introduced in ESP-IDF but not in Chip-ROM