Sfoglia il codice sorgente

Merge branch 'feature/support_flash_mmap_pytest_c6_h2' into 'master'

spi_flash: support flash mmap pytest c6 h2

Closes IDF-7009

See merge request espressif/esp-idf!22935
Jiang Guang Ming 2 anni fa
parent
commit
a32699c2a7

+ 0 - 6
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

+ 2 - 2
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 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |

+ 2 - 1
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',

+ 0 - 1
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