Merge branch 'feature/c6_sdspi_host' into 'master'

sdspi: bringup sdspi on c6

Closes IDF-5860

See merge request espressif/esp-idf!21681
This commit is contained in:
morris
2022-12-21 14:07:56 +08:00
6 changed files with 7 additions and 22 deletions

View File

@@ -1,11 +1,7 @@
# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
components/fatfs/test_apps/sdcard: components/fatfs/test_apps/sdcard:
disable:
- if: IDF_TARGET == "esp32c6"
temporary: true
reason: target esp32c6 is not supported yet
disable_test: disable_test:
- if: IDF_TARGET in ["esp32s3", "esp32c2"] - if: IDF_TARGET in ["esp32s3", "esp32c2", "esp32c6"]
temporary: true temporary: true
reason: No sdspi runners for these targets reason: No sdspi runners for these targets

View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
This test app runs a few FATFS test cases in a FAT-formatted SD card. This test app runs a few FATFS test cases in a FAT-formatted SD card.

View File

@@ -34,7 +34,7 @@
#define SDSPI_MOSI_PIN 35 #define SDSPI_MOSI_PIN 35
#define SDSPI_CLK_PIN 36 #define SDSPI_CLK_PIN 36
#define SDSPI_CS_PIN 34 #define SDSPI_CS_PIN 34
#elif CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6
#define SDSPI_MISO_PIN 6 #define SDSPI_MISO_PIN 6
#define SDSPI_MOSI_PIN 4 #define SDSPI_MOSI_PIN 4
#define SDSPI_CLK_PIN 5 #define SDSPI_CLK_PIN 5
@@ -47,8 +47,6 @@
#endif //SPI_DMA_CHAN #endif //SPI_DMA_CHAN
#define SDSPI_HOST_ID SPI2_HOST #define SDSPI_HOST_ID SPI2_HOST
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3, ESP32C2)
//no runners
typedef struct sdspi_mem { typedef struct sdspi_mem {
size_t heap_size; size_t heap_size;
@@ -161,5 +159,3 @@ TEST_CASE("(SDSPI) can get partition info", "[fatfs][sdspi]")
test_teardown_sdspi(&mem); test_teardown_sdspi(&mem);
} }
#endif //TEMPORARY_DISABLED_FOR_TARGETS(ESP32S3)

View File

@@ -91,13 +91,11 @@ api-reference/storage/sdmmc
api-reference/storage/mass_mfg api-reference/storage/mass_mfg
api-reference/storage/index api-reference/storage/index
api-reference/peripherals api-reference/peripherals
api-reference/peripherals/sdspi_share
api-reference/peripherals/adc_continuous api-reference/peripherals/adc_continuous
api-reference/peripherals/adc_oneshot api-reference/peripherals/adc_oneshot
api-reference/peripherals/usb_host api-reference/peripherals/usb_host
api-reference/peripherals/hmac api-reference/peripherals/hmac
api-reference/peripherals/usb_device api-reference/peripherals/usb_device
api-reference/peripherals/sdspi_host
api-reference/peripherals/dac api-reference/peripherals/dac
api-reference/peripherals/touch_element api-reference/peripherals/touch_element
api-reference/peripherals/secure_element api-reference/peripherals/secure_element

View File

@@ -105,12 +105,8 @@ examples/storage/sd_card/sdmmc:
reason: lack of runners reason: lack of runners
examples/storage/sd_card/sdspi: examples/storage/sd_card/sdspi:
disable:
- if: IDF_TARGET == "esp32c2" or IDF_TARGET == "esp32c6"
temporary: true
reason: target(s) not supported yet
disable_test: disable_test:
- if: IDF_TARGET == "esp32s3" - if: IDF_TARGET in ["esp32s3", "esp32c2", "esp32c6"]
temporary: true temporary: true
reason: lack of runners reason: lack of runners

View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
# SD Card example (SDSPI) # SD Card example (SDSPI)
@@ -125,4 +125,3 @@ An attempt to download a new firmware under this conditions may also result in t
`esptool --port PORT --before no_reset --baud 115200 --chip esp32 erase_flash` `esptool --port PORT --before no_reset --baud 115200 --chip esp32 erase_flash`
to erase your board's flash, then flash the firmware again. to erase your board's flash, then flash the firmware again.