Skip to content

Commit 33953f5

Browse files
mantriyogeshmantriyogesh
committed
Merge branch 'feature/esp32c5_support' into 'feature/esp_as_mcu_host'
feature/esp32c5_support Added ESP32-C5 support See merge request app-frameworks/esp_hosted!470
2 parents d24830e + d518421 commit 33953f5

28 files changed

+7717
-3819
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ else()
66
set(host_dir "${FG_root_dir}/host")
77

88
set(COMPONENT_ADD_INCLUDEDIRS "${host_dir}" "${host_dir}/port" "${host_dir}/api")
9-
set(COMPONENT_SRCS "${host_dir}/esp_hosted_host_init.c" "${host_dir}/api/esp_hosted_api.c" "${host_dir}/drivers/transport/transport_drv.c" "${host_dir}/drivers/serial/serial_ll_if.c" "${host_dir}/utils/common.c" "${host_dir}/utils/util.c" "${host_dir}/utils/stats.c" "${host_dir}/port/os_wrapper.c" "${host_dir}/drivers/serial/serial_drv.c")
9+
set(COMPONENT_SRCS "${host_dir}/esp_hosted_host_init.c" "${host_dir}/api/esp_wifi_weak.c" "${host_dir}/api/esp_hosted_api.c" "${host_dir}/drivers/transport/transport_drv.c" "${host_dir}/drivers/serial/serial_ll_if.c" "${host_dir}/utils/common.c" "${host_dir}/utils/util.c" "${host_dir}/utils/stats.c" "${host_dir}/port/os_wrapper.c" "${host_dir}/drivers/serial/serial_drv.c")
1010

1111
list(APPEND COMPONENT_ADD_INCLUDEDIRS "." "${host_dir}/api" "${host_dir}/drivers/transport" "${host_dir}/drivers/transport/spi" "${host_dir}/drivers/transport/sdio" "${host_dir}/drivers/serial" "${host_dir}/utils")
1212

‎Kconfig

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ menu "ESP-Hosted config"
6161
config SLAVE_CHIPSET_ESP32C6
6262
depends on ESP_SPI_HOST_INTERFACE || ESP_SDIO_HOST_INTERFACE || ESP_SPI_HD_HOST_INTERFACE
6363
bool "Slave as ESP32C6"
64+
65+
config SLAVE_CHIPSET_ESP32C5
66+
depends on ESP_SPI_HOST_INTERFACE || ESP_SPI_HD_HOST_INTERFACE
67+
bool "Slave as ESP32C5"
6468
endchoice
6569

6670
config IDF_SLAVE_TARGET
@@ -71,6 +75,7 @@ menu "ESP-Hosted config"
7175
default "esp32c2" if SLAVE_CHIPSET_ESP32C2
7276
default "esp32c3" if SLAVE_CHIPSET_ESP32C3
7377
default "esp32c6" if SLAVE_CHIPSET_ESP32C6
78+
default "esp32c5" if SLAVE_CHIPSET_ESP32C5
7479
default "invalid"
7580

7681
menu "Task defaults"
@@ -312,9 +317,9 @@ ESP32XX_SPI_CLK_FREQ_RANGE_MAX := 40
312317
"Optimize SPI CLK by increasing till host practically can support"
313318

314319
config ESP_SPI_FREQ_ESP32XX
315-
depends on SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3
316-
int "SPI Clock Freq (MHz)"
317-
default 30 if SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3
320+
depends on SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3 || SLAVE_CHIPSET_ESP32C5
321+
int "SPI Clock Freq"
322+
default 30 if SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3 || SLAVE_CHIPSET_ESP32C5
318323
range $(ESP32XX_SPI_CLK_FREQ_RANGE_MIN) $(ESP32XX_SPI_CLK_FREQ_RANGE_MAX)
319324
help
320325
"Optimize SPI CLK by increasing till host practically can support"
@@ -323,7 +328,7 @@ ESP32XX_SPI_CLK_FREQ_RANGE_MAX := 40
323328
int
324329
default ESP_SPI_FREQ_ESP32 if SLAVE_CHIPSET_ESP32
325330
default ESP_SPI_FREQ_ESP32C6 if SLAVE_CHIPSET_ESP32C6
326-
default ESP_SPI_FREQ_ESP32XX if SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3
331+
default ESP_SPI_FREQ_ESP32XX if SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3 || SLAVE_CHIPSET_ESP32C5
327332
help
328333
"Optimize SPI CLK by increasing till host practically can support"
329334

@@ -547,31 +552,31 @@ ESP32XX_SDIO_CLK_FREQ_KHZ_RANGE_MAX := 80000
547552
menu "Host GPIOs Config"
548553
config ESP_SPI_HD_GPIO_CS
549554
int "GPIO pin for Host CS"
550-
default 47 if IDF_TARGET_ESP32S3
555+
default 10 if IDF_TARGET_ESP32S3
551556
default 19 if IDF_TARGET_ESP32P4
552557
default 15
553558
help
554559
SPI Half-duplex controller Host CS
555560

556561
config ESP_SPI_HD_GPIO_CLK
557562
int "GPIO pin for Host CLK"
558-
default 19 if IDF_TARGET_ESP32S3
563+
default 12 if IDF_TARGET_ESP32S3
559564
default 18 if IDF_TARGET_ESP32P4
560565
default 18
561566
help
562567
SPI Half-duplex controller Host CLK
563568

564569
config ESP_SPI_HD_GPIO_D0
565570
int "GPIO pin for Host D0"
566-
default 13 if IDF_TARGET_ESP32S3
571+
default 11 if IDF_TARGET_ESP32S3
567572
default 14 if IDF_TARGET_ESP32P4
568573
default 2
569574
help
570575
SPI Half-duplex controller Host D0
571576

572577
config ESP_SPI_HD_GPIO_D1
573578
int "GPIO pin for Host D1"
574-
default 35 if IDF_TARGET_ESP32S3
579+
default 13 if IDF_TARGET_ESP32S3
575580
default 15 if IDF_TARGET_ESP32P4
576581
default 4
577582
help
@@ -580,7 +585,7 @@ ESP32XX_SDIO_CLK_FREQ_KHZ_RANGE_MAX := 80000
580585
config ESP_SPI_HD_GPIO_D2
581586
depends on ESP_SPI_HD_PRIV_INTERFACE_4_DATA_LINES
582587
int "GPIO pin for Host D2"
583-
default 20 if IDF_TARGET_ESP32S3
588+
default 14 if IDF_TARGET_ESP32S3
584589
default 16 if IDF_TARGET_ESP32P4
585590
default 12
586591
help
@@ -597,15 +602,15 @@ ESP32XX_SDIO_CLK_FREQ_KHZ_RANGE_MAX := 80000
597602

598603
config ESP_SPI_HD_GPIO_DATA_READY
599604
int "GPIO pin for data ready interrupt"
600-
default 12 if IDF_TARGET_ESP32S3
605+
default 4 if IDF_TARGET_ESP32S3
601606
default 6 if IDF_TARGET_ESP32P4
602607
default 8
603608
help
604609
GPIO pin for indicating host that slave has data to be read by host
605610

606611
config ESP_SPI_HD_GPIO_RESET_SLAVE
607612
int "GPIO pin for Reseting slave ESP"
608-
default 42 if IDF_TARGET_ESP32S3
613+
default 5 if IDF_TARGET_ESP32S3
609614
default 54 if IDF_TARGET_ESP32P4 && SLAVE_CHIPSET_ESP32C6
610615
default 5
611616
help
@@ -626,17 +631,17 @@ ESP32XX_SPI_HD_CLK_FREQ_RANGE_MAX := 40
626631
"Optimize CLK by increasing till host practically can support"
627632

628633
config ESP_SPI_HD_FREQ_ESP32XX
629-
depends on SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3
634+
depends on SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3 || SLAVE_CHIPSET_ESP32C5
630635
int "SPI HD Clock Freq (MHz)"
631-
default 10 if SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3
636+
default 10 if SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3 || SLAVE_CHIPSET_ESP32C5
632637
range $(ESP32XX_SPI_HD_CLK_FREQ_RANGE_MIN) $(ESP32XX_SPI_HD_CLK_FREQ_RANGE_MAX)
633638
help
634639
"Optimize CLK by increasing till host practically can support"
635640

636641
config ESP_SPI_HD_CLK_FREQ
637642
int
638643
default ESP_SPI_HD_FREQ_ESP32C6 if SLAVE_CHIPSET_ESP32C6
639-
default ESP_SPI_HD_FREQ_ESP32XX if SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3
644+
default ESP_SPI_HD_FREQ_ESP32XX if SLAVE_CHIPSET_ESP32C2 || SLAVE_CHIPSET_ESP32C3 || SLAVE_CHIPSET_ESP32S2 || SLAVE_CHIPSET_ESP32S3 || SLAVE_CHIPSET_ESP32C5
640645
help
641646
"Optimize CLK by increasing till host practically can support"
642647

@@ -772,7 +777,7 @@ ESP32XX_SPI_HD_CLK_FREQ_RANGE_MAX := 40
772777
config ESP_RAW_TP_REPORT_INTERVAL
773778
depends on ESP_RAW_THROUGHPUT_TRANSPORT
774779
int "RawTP: periodic duration to report stats accumulated"
775-
default 30
780+
default 5
776781

777782
config ESP_PKT_STATS
778783
bool "Transport level packet stats"

0 commit comments

Comments
 (0)