Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 03:45:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch/risc-v/esp32c3: rename ESP32-C3 Generic configs

Browse Source 
- ARCH_CHIP_ESP32C3_LEGACY created
- ARCH_CHIP_ESP32C3_GENERIC is now ARCH_CHIP_ESP32C3

This is part of deprecating esp32c3-devkit as esp32c3-legacy and
using esp32c3-generic (now esp32c3-devkit) instead.

Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
This commit is contained in:
Filipe Cavalcanti
2025-11-19 09:12:19 -03:00
committed by Xiang Xiao
parent ea1d59e89c
commit 6ccc5847fb
9 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/risc-v/Kconfig
+8 -8
View File
@@ -70,8 +70,8 @@ config ARCH_CHIP_BL602
---help--- ---help---
BouffaloLab BL602(rv32imfc) BouffaloLab BL602(rv32imfc)
config ARCH_CHIP_ESP32C3 config ARCH_CHIP_ESP32C3_LEGACY
bool "Espressif ESP32-C3" bool "Espressif ESP32-C3 (Legacy)"
select ARCH_RV32 select ARCH_RV32
select ARCH_RV_ISA_M select ARCH_RV_ISA_M
select ARCH_RV_ISA_C select ARCH_RV_ISA_C
@@ -98,9 +98,9 @@ config ARCH_CHIP_ESP32C3
select ONESHOT_COUNT if ONESHOT select ONESHOT_COUNT if ONESHOT
select ONESHOT_FAST_DIVISION if ONESHOT select ONESHOT_FAST_DIVISION if ONESHOT
---help--- ---help---
Espressif ESP32-C3 (RV32IMC). Espressif ESP32-C3 (RV32IMC). Legacy implementation.
config ARCH_CHIP_ESP32C3_GENERIC config ARCH_CHIP_ESP32C3
bool "ESP32-C3" bool "ESP32-C3"
select ARCH_RV32 select ARCH_RV32
select ARCH_RV_ISA_M select ARCH_RV_ISA_M
@@ -600,8 +600,8 @@ config ARCH_CHIP
default "k210" if ARCH_CHIP_K210 default "k210" if ARCH_CHIP_K210
default "litex" if ARCH_CHIP_LITEX default "litex" if ARCH_CHIP_LITEX
default "bl602" if ARCH_CHIP_BL602 default "bl602" if ARCH_CHIP_BL602
default "esp32c3-legacy" if ARCH_CHIP_ESP32C3 default "esp32c3-legacy" if ARCH_CHIP_ESP32C3_LEGACY
default "esp32c3" if ARCH_CHIP_ESP32C3_GENERIC default "esp32c3" if ARCH_CHIP_ESP32C3
default "esp32c6" if ARCH_CHIP_ESP32C6 default "esp32c6" if ARCH_CHIP_ESP32C6
default "esp32h2" if ARCH_CHIP_ESP32H2 default "esp32h2" if ARCH_CHIP_ESP32H2
default "c906" if ARCH_CHIP_C906 default "c906" if ARCH_CHIP_C906
@@ -814,10 +814,10 @@ endif
if ARCH_CHIP_BL602 if ARCH_CHIP_BL602
source "arch/risc-v/src/bl602/Kconfig" source "arch/risc-v/src/bl602/Kconfig"
endif endif
if ARCH_CHIP_ESP32C3 if ARCH_CHIP_ESP32C3_LEGACY
source "arch/risc-v/src/esp32c3-legacy/Kconfig" source "arch/risc-v/src/esp32c3-legacy/Kconfig"
endif endif
if ARCH_CHIP_ESP32C3_GENERIC if ARCH_CHIP_ESP32C3
source "arch/risc-v/src/esp32c3/Kconfig" source "arch/risc-v/src/esp32c3/Kconfig"
endif endif
if ARCH_CHIP_ESP32C6 if ARCH_CHIP_ESP32C6
arch/risc-v/src/common/espressif/Kconfig
+52 -52
View File
@@ -3,18 +3,18 @@
# see the file kconfig-language.txt in the NuttX tools repository. # see the file kconfig-language.txt in the NuttX tools repository.
# #
if ARCH_CHIP_ESPRESSIF || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2 || ARCH_CHIP_ESP32C3_GENERIC if ARCH_CHIP_ESPRESSIF || ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2
config ESPRESSIF_CHIP_SERIES config ESPRESSIF_CHIP_SERIES
string string
default "esp32c3" if ARCH_CHIP_ESP32C3_GENERIC default "esp32c3" if ARCH_CHIP_ESP32C3
default "esp32c6" if ARCH_CHIP_ESP32C6 default "esp32c6" if ARCH_CHIP_ESP32C6
default "esp32h2" if ARCH_CHIP_ESP32H2 default "esp32h2" if ARCH_CHIP_ESP32H2
default "unknown" default "unknown"
choice ESPRESSIF_FLASH choice ESPRESSIF_FLASH
prompt "Flash Size" prompt "Flash Size"
default ESPRESSIF_FLASH_4M if ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2 default ESPRESSIF_FLASH_4M if ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2
config ESPRESSIF_FLASH_2M config ESPRESSIF_FLASH_2M
bool "2 MB" bool "2 MB"
@@ -38,18 +38,18 @@ config ESPRESSIF_FLASH_DETECT
config ESPRESSIF_NUM_CPUS config ESPRESSIF_NUM_CPUS
int int
default 1 if ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2 default 1 if ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2
choice ESPRESSIF_CPU_FREQ choice ESPRESSIF_CPU_FREQ
prompt "CPU frequency" prompt "CPU frequency"
default ESPRESSIF_CPU_FREQ_96 if ARCH_CHIP_ESP32H2 default ESPRESSIF_CPU_FREQ_96 if ARCH_CHIP_ESP32H2
default ESPRESSIF_CPU_FREQ_160 if ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 default ESPRESSIF_CPU_FREQ_160 if ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
---help--- ---help---
CPU frequency to be set on application startup. CPU frequency to be set on application startup.
config ESPRESSIF_CPU_FREQ_40 config ESPRESSIF_CPU_FREQ_40
bool "40 MHz" bool "40 MHz"
depends on ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 depends on ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
---help--- ---help---
Set the CPU frequency to 40 MHz. Set the CPU frequency to 40 MHz.
@@ -67,7 +67,7 @@ config ESPRESSIF_CPU_FREQ_64
config ESPRESSIF_CPU_FREQ_80 config ESPRESSIF_CPU_FREQ_80
bool "80 MHz" bool "80 MHz"
depends on ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 depends on ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
---help--- ---help---
Set the CPU frequency to 80 MHz. Set the CPU frequency to 80 MHz.
@@ -79,7 +79,7 @@ config ESPRESSIF_CPU_FREQ_96
config ESPRESSIF_CPU_FREQ_160 config ESPRESSIF_CPU_FREQ_160
bool "160 MHz" bool "160 MHz"
depends on ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 depends on ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
---help--- ---help---
Set the CPU frequency to 160 MHz. Set the CPU frequency to 160 MHz.
@@ -784,7 +784,7 @@ config ESPRESSIF_TWAI1
config ESPRESSIF_USBSERIAL config ESPRESSIF_USBSERIAL
bool "USB-Serial-JTAG Driver" bool "USB-Serial-JTAG Driver"
default n default n
select ESPRESSIF_ESPTOOLPY_NO_STUB if ARCH_CHIP_ESP32C3_GENERIC select ESPRESSIF_ESPTOOLPY_NO_STUB if ARCH_CHIP_ESP32C3
select OTHER_UART_SERIALDRIVER select OTHER_UART_SERIALDRIVER
select ARCH_HAVE_SERIAL_TERMIOS select ARCH_HAVE_SERIAL_TERMIOS
@@ -1031,7 +1031,7 @@ config ESPRESSIF_RWDT
config ESPRESSIF_XTWDT config ESPRESSIF_XTWDT
bool "XTAL32K Watchdog Timer" bool "XTAL32K Watchdog Timer"
depends on ARCH_CHIP_ESP32C3_GENERIC depends on ARCH_CHIP_ESP32C3
depends on ESPRESSIF_RTCIO_IRQ depends on ESPRESSIF_RTCIO_IRQ
depends on ESPRESSIF_RTC_CLK_EXT_OSC || ESPRESSIF_RTC_CLK_EXT_XTAL depends on ESPRESSIF_RTC_CLK_EXT_OSC || ESPRESSIF_RTC_CLK_EXT_XTAL
default n default n
@@ -1101,7 +1101,7 @@ config ESP_WIRELESS
config ESPRESSIF_WIFI config ESPRESSIF_WIFI
bool "Wi-Fi" bool "Wi-Fi"
depends on ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 depends on ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
default n default n
select ESP_WIRELESS select ESP_WIRELESS
---help--- ---help---
@@ -1109,7 +1109,7 @@ config ESPRESSIF_WIFI
config ESPRESSIF_BLE config ESPRESSIF_BLE
bool "BLE" bool "BLE"
depends on ARCH_CHIP_ESP32C3_GENERIC depends on ARCH_CHIP_ESP32C3
default n default n
select ESP_WIRELESS select ESP_WIRELESS
---help--- ---help---
@@ -1876,39 +1876,39 @@ config ESPRESSIF_UART0_RS485_DIR_POLARITY
config ESPRESSIF_UART0_TXPIN config ESPRESSIF_UART0_TXPIN
int "UART0 TX Pin" int "UART0 TX Pin"
default 21 if ARCH_CHIP_ESP32C3_GENERIC default 21 if ARCH_CHIP_ESP32C3
default 16 if ARCH_CHIP_ESP32C6 default 16 if ARCH_CHIP_ESP32C6
default 24 if ARCH_CHIP_ESP32H2 default 24 if ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_UART0_RXPIN config ESPRESSIF_UART0_RXPIN
int "UART0 RX Pin" int "UART0 RX Pin"
default 20 if ARCH_CHIP_ESP32C3_GENERIC default 20 if ARCH_CHIP_ESP32C3
default 17 if ARCH_CHIP_ESP32C6 default 17 if ARCH_CHIP_ESP32C6
default 23 if ARCH_CHIP_ESP32H2 default 23 if ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_UART0_RTSPIN config ESPRESSIF_UART0_RTSPIN
int "UART0 RTS Pin" int "UART0 RTS Pin"
depends on SERIAL_IFLOWCONTROL depends on SERIAL_IFLOWCONTROL
default 16 if ARCH_CHIP_ESP32C3_GENERIC default 16 if ARCH_CHIP_ESP32C3
default 15 if ARCH_CHIP_ESP32C6 default 15 if ARCH_CHIP_ESP32C6
default 22 if ARCH_CHIP_ESP32H2 default 22 if ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_UART0_CTSPIN config ESPRESSIF_UART0_CTSPIN
int "UART0 CTS Pin" int "UART0 CTS Pin"
depends on SERIAL_OFLOWCONTROL depends on SERIAL_OFLOWCONTROL
default 15 if ARCH_CHIP_ESP32C3_GENERIC default 15 if ARCH_CHIP_ESP32C3
default 14 if ARCH_CHIP_ESP32C6 default 14 if ARCH_CHIP_ESP32C6
default 21 if ARCH_CHIP_ESP32H2 default 21 if ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
@@ -1943,25 +1943,25 @@ config ESPRESSIF_UART1_RS485_DIR_POLARITY
config ESPRESSIF_UART1_TXPIN config ESPRESSIF_UART1_TXPIN
int "UART1 TX Pin" int "UART1 TX Pin"
default 8 if ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2 default 8 if ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2
config ESPRESSIF_UART1_RXPIN config ESPRESSIF_UART1_RXPIN
int "UART1 RX Pin" int "UART1 RX Pin"
default 9 if ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2 default 9 if ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2
config ESPRESSIF_UART1_RTSPIN config ESPRESSIF_UART1_RTSPIN
int "UART1 RTS Pin" int "UART1 RTS Pin"
depends on SERIAL_IFLOWCONTROL depends on SERIAL_IFLOWCONTROL
default 1 if ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2 default 1 if ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_UART1_CTSPIN config ESPRESSIF_UART1_CTSPIN
int "UART1 CTS Pin" int "UART1 CTS Pin"
depends on SERIAL_OFLOWCONTROL depends on SERIAL_OFLOWCONTROL
default 2 if ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2 default 2 if ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
@@ -2139,37 +2139,37 @@ config ESPRESSIF_SPI2_SLAVE_BUFSIZE
config ESPRESSIF_SPI2_CSPIN config ESPRESSIF_SPI2_CSPIN
int "SPI2 CS Pin" int "SPI2 CS Pin"
default 10 if ARCH_CHIP_ESP32C3_GENERIC default 10 if ARCH_CHIP_ESP32C3
default 16 if ARCH_CHIP_ESP32C6 default 16 if ARCH_CHIP_ESP32C6
default 1 if ARCH_CHIP_ESP32H2 default 1 if ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_SPI2_CLKPIN config ESPRESSIF_SPI2_CLKPIN
int "SPI2 CLK Pin" int "SPI2 CLK Pin"
default 6 if ARCH_CHIP_ESP32C3_GENERIC default 6 if ARCH_CHIP_ESP32C3
default 6 if ARCH_CHIP_ESP32C6 default 6 if ARCH_CHIP_ESP32C6
default 4 if ARCH_CHIP_ESP32H2 default 4 if ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_SPI2_MOSIPIN config ESPRESSIF_SPI2_MOSIPIN
int "SPI2 MOSI Pin" int "SPI2 MOSI Pin"
default 7 if ARCH_CHIP_ESP32C3_GENERIC default 7 if ARCH_CHIP_ESP32C3
default 7 if ARCH_CHIP_ESP32C6 default 7 if ARCH_CHIP_ESP32C6
default 5 if ARCH_CHIP_ESP32H2 default 5 if ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_SPI2_MISOPIN config ESPRESSIF_SPI2_MISOPIN
int "SPI2 MISO Pin" int "SPI2 MISO Pin"
default 2 if ARCH_CHIP_ESP32C3_GENERIC default 2 if ARCH_CHIP_ESP32C3
default 2 if ARCH_CHIP_ESP32C6 default 2 if ARCH_CHIP_ESP32C6
default 0 if ARCH_CHIP_ESP32H2 default 0 if ARCH_CHIP_ESP32H2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
@@ -2192,28 +2192,28 @@ endchoice # ESPRESSIF_SPI_BITBANG_OPERATION_MODE
config ESPRESSIF_SPI_BITBANG_CSPIN config ESPRESSIF_SPI_BITBANG_CSPIN
int "SPI Bitbang CS Pin" int "SPI Bitbang CS Pin"
default 0 default 0
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_SPI_BITBANG_CLKPIN config ESPRESSIF_SPI_BITBANG_CLKPIN
int "SPI Bitbang CLK Pin" int "SPI Bitbang CLK Pin"
default 1 default 1
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_SPI_BITBANG_MOSIPIN config ESPRESSIF_SPI_BITBANG_MOSIPIN
int "SPI Bitbang MOSI Pin" int "SPI Bitbang MOSI Pin"
default 2 default 2
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
config ESPRESSIF_SPI_BITBANG_MISOPIN config ESPRESSIF_SPI_BITBANG_MISOPIN
int "SPI Bitbang MISO Pin" int "SPI Bitbang MISO Pin"
default 3 default 3
range 0 21 if ARCH_CHIP_ESP32C3_GENERIC range 0 21 if ARCH_CHIP_ESP32C3
range 0 30 if ARCH_CHIP_ESP32C6 range 0 30 if ARCH_CHIP_ESP32C6
range 0 27 if ARCH_CHIP_ESP32H2 range 0 27 if ARCH_CHIP_ESP32H2
@@ -2287,14 +2287,14 @@ endchoice # ESPRESSIF_FLASH_MODE
choice ESPRESSIF_FLASH_FREQ choice ESPRESSIF_FLASH_FREQ
prompt "SPI Flash frequency" prompt "SPI Flash frequency"
default ESPRESSIF_FLASH_FREQ_80M if ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 default ESPRESSIF_FLASH_FREQ_80M if ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
default ESPRESSIF_FLASH_FREQ_64M if ARCH_CHIP_ESP32H2 default ESPRESSIF_FLASH_FREQ_64M if ARCH_CHIP_ESP32H2
---help--- ---help---
SPI Flash frequency. SPI Flash frequency.
config ESPRESSIF_FLASH_FREQ_80M config ESPRESSIF_FLASH_FREQ_80M
bool "80 MHz" bool "80 MHz"
depends on ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 depends on ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
config ESPRESSIF_FLASH_FREQ_64M config ESPRESSIF_FLASH_FREQ_64M
bool "64 MHz" bool "64 MHz"
@@ -2302,15 +2302,15 @@ config ESPRESSIF_FLASH_FREQ_64M
config ESPRESSIF_FLASH_FREQ_40M config ESPRESSIF_FLASH_FREQ_40M
bool "40 MHz" bool "40 MHz"
depends on ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 depends on ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
config ESPRESSIF_FLASH_FREQ_26M config ESPRESSIF_FLASH_FREQ_26M
bool "26 MHz" bool "26 MHz"
depends on ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 depends on ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
config ESPRESSIF_FLASH_FREQ_20M config ESPRESSIF_FLASH_FREQ_20M
bool "20 MHz" bool "20 MHz"
depends on ARCH_CHIP_ESP32C3_GENERIC || ARCH_CHIP_ESP32C6 depends on ARCH_CHIP_ESP32C3 || ARCH_CHIP_ESP32C6
endchoice # ESPRESSIF_FLASH_FREQ endchoice # ESPRESSIF_FLASH_FREQ
@@ -2335,7 +2335,7 @@ config ESPRESSIF_FLASH_FREQ
config ESPRESSIF_SPI_FLASH_USE_ROM_CODE config ESPRESSIF_SPI_FLASH_USE_ROM_CODE
bool "Use SPI flash driver in ROM" bool "Use SPI flash driver in ROM"
default n default n
depends on ARCH_CHIP_ESP32C3_GENERIC depends on ARCH_CHIP_ESP32C3
---help--- ---help---
Use functions in ROM for SPI flash driver instead of Use functions in ROM for SPI flash driver instead of
source code. source code.
@@ -2463,8 +2463,8 @@ config ESPRESSIF_LEDC_TIMER0_CHANNELS
config ESPRESSIF_LEDC_TIMER0_RESOLUTION config ESPRESSIF_LEDC_TIMER0_RESOLUTION
int "Timer 0 resolution" int "Timer 0 resolution"
default 13 default 13
range 1 14 if ARCH_CHIP_ESP32C3_GENERIC && !(ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2) range 1 14 if ARCH_CHIP_ESP32C3 && !(ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2)
range 1 20 if !ARCH_CHIP_ESP32C3_GENERIC && (ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2) range 1 20 if !ARCH_CHIP_ESP32C3 && (ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2)
---help--- ---help---
Timer resolution in bits. The resolution is the number of bits used to by the timer Timer resolution in bits. The resolution is the number of bits used to by the timer
counter to generate the PWM signal. The duty cycle provided by the upper layers counter to generate the PWM signal. The duty cycle provided by the upper layers
@@ -2487,8 +2487,8 @@ config ESPRESSIF_LEDC_TIMER1_CHANNELS
config ESPRESSIF_LEDC_TIMER1_RESOLUTION config ESPRESSIF_LEDC_TIMER1_RESOLUTION
int "Timer 1 resolution" int "Timer 1 resolution"
default 13 default 13
range 1 14 if ARCH_CHIP_ESP32C3_GENERIC && !(ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2) range 1 14 if ARCH_CHIP_ESP32C3 && !(ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2)
range 1 20 if !ARCH_CHIP_ESP32C3_GENERIC && (ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2) range 1 20 if !ARCH_CHIP_ESP32C3 && (ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2)
---help--- ---help---
Timer resolution in bits. The resolution is the number of bits used to by the timer Timer resolution in bits. The resolution is the number of bits used to by the timer
counter to generate the PWM signal. The duty cycle provided by the upper layers counter to generate the PWM signal. The duty cycle provided by the upper layers
@@ -2511,8 +2511,8 @@ config ESPRESSIF_LEDC_TIMER2_CHANNELS
config ESPRESSIF_LEDC_TIMER2_RESOLUTION config ESPRESSIF_LEDC_TIMER2_RESOLUTION
int "Timer 2 resolution" int "Timer 2 resolution"
default 13 default 13
range 1 14 if ARCH_CHIP_ESP32C3_GENERIC && !(ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2) range 1 14 if ARCH_CHIP_ESP32C3 && !(ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2)
range 1 20 if !ARCH_CHIP_ESP32C3_GENERIC && (ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2) range 1 20 if !ARCH_CHIP_ESP32C3 && (ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2)
---help--- ---help---
Timer resolution in bits. The resolution is the number of bits used to by the timer Timer resolution in bits. The resolution is the number of bits used to by the timer
counter to generate the PWM signal. The duty cycle provided by the upper layers counter to generate the PWM signal. The duty cycle provided by the upper layers
@@ -2535,8 +2535,8 @@ config ESPRESSIF_LEDC_TIMER3_CHANNELS
config ESPRESSIF_LEDC_TIMER3_RESOLUTION config ESPRESSIF_LEDC_TIMER3_RESOLUTION
int "Timer 3 resolution" int "Timer 3 resolution"
default 13 default 13
range 1 14 if ARCH_CHIP_ESP32C3_GENERIC && !(ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2) range 1 14 if ARCH_CHIP_ESP32C3 && !(ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2)
range 1 20 if !ARCH_CHIP_ESP32C3_GENERIC && (ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2) range 1 20 if !ARCH_CHIP_ESP32C3 && (ARCH_CHIP_ESP32C6 || ARCH_CHIP_ESP32H2)
---help--- ---help---
Timer resolution in bits. The resolution is the number of bits used to by the timer Timer resolution in bits. The resolution is the number of bits used to by the timer
counter to generate the PWM signal. The duty cycle provided by the upper layers counter to generate the PWM signal. The duty cycle provided by the upper layers
arch/risc-v/src/common/espressif/Make.defs
+1 -1
View File
@@ -207,7 +207,7 @@ endif
ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty
ifndef ESP_HAL_3RDPARTY_VERSION ifndef ESP_HAL_3RDPARTY_VERSION
ESP_HAL_3RDPARTY_VERSION = 4f1113915eb5e9048cc885e38290a57dddb283c0 ESP_HAL_3RDPARTY_VERSION = bb255ca422f4b4d60c9f4f74dbdf51316dc2b669
endif endif
ifndef ESP_HAL_3RDPARTY_URL ifndef ESP_HAL_3RDPARTY_URL
arch/risc-v/src/common/espressif/esp_rtc.c
+1 -1
View File
@@ -49,7 +49,7 @@
/* Chip-dependent headers from esp-hal-3rdparty */ /* Chip-dependent headers from esp-hal-3rdparty */
#ifdef CONFIG_ARCH_CHIP_ESP32C3_GENERIC #ifdef CONFIG_ARCH_CHIP_ESP32C3
#include "esp32c3/rom/rtc.h" #include "esp32c3/rom/rtc.h"
#elif defined(CONFIG_ARCH_CHIP_ESP32C6) #elif defined(CONFIG_ARCH_CHIP_ESP32C6)
#include "esp32c6/rom/rtc.h" #include "esp32c6/rom/rtc.h"
arch/risc-v/src/common/espressif/esp_rtc_gpio.c
+3 -3
View File
@@ -58,12 +58,12 @@
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_CHIP_ESP32C3_GENERIC #ifdef CONFIG_ARCH_CHIP_ESP32C3
#ifdef CONFIG_ESPRESSIF_RTCIO_IRQ #ifdef CONFIG_ESPRESSIF_RTCIO_IRQ
static int g_rtcio_cpuint; static int g_rtcio_cpuint;
static uint32_t last_status; static uint32_t last_status;
#ifdef CONFIG_ARCH_CHIP_ESP32C3_GENERIC #ifdef CONFIG_ARCH_CHIP_ESP32C3
static const int rtc_irq_reg_shift[ESP_NIRQ_RTCIO] = static const int rtc_irq_reg_shift[ESP_NIRQ_RTCIO] =
{ {
RTC_CNTL_SLP_WAKEUP_INT_ENA_S, RTC_CNTL_SLP_WAKEUP_INT_ENA_S,
@@ -269,7 +269,7 @@ void esp_rtcioirqdisable(int irq)
up_enable_irq(ESP_IRQ_RTC_CORE); up_enable_irq(ESP_IRQ_RTC_CORE);
} }
#endif /* CONFIG_ESPRESSIF_RTCIO_IRQ */ #endif /* CONFIG_ESPRESSIF_RTCIO_IRQ */
#endif /* CONFIG_ARCH_CHIP_ESP32C3_GENERIC */ #endif /* CONFIG_ARCH_CHIP_ESP32C3 */
#ifdef CONFIG_ARCH_CHIP_ESP32C6 #ifdef CONFIG_ARCH_CHIP_ESP32C6
/**************************************************************************** /****************************************************************************
arch/risc-v/src/common/espressif/esp_spi.c
+1 -1
View File
@@ -88,7 +88,7 @@
# define MISO_PIN_ATTR (INPUT_FUNCTION_2 | PULLUP) # define MISO_PIN_ATTR (INPUT_FUNCTION_2 | PULLUP)
#endif #endif
#if defined(CONFIG_ARCH_CHIP_ESP32C3_GENERIC) #if defined(CONFIG_ARCH_CHIP_ESP32C3)
#define SPI2_IOMUX_MISOPIN 2 #define SPI2_IOMUX_MISOPIN 2
#define SPI2_IOMUX_MOSIPIN 7 #define SPI2_IOMUX_MOSIPIN 7
#define SPI2_IOMUX_CLKPIN 6 #define SPI2_IOMUX_CLKPIN 6
arch/risc-v/src/common/espressif/esp_twai.c
+2 -2
View File
@@ -95,11 +95,11 @@
# endif # endif
#endif #endif
#ifdef CONFIG_ARCH_CHIP_ESP32C3_GENERIC #ifdef CONFIG_ARCH_CHIP_ESP32C3
# define INT_ENA_REG(hw) hw->interrupt_enable_reg.val # define INT_ENA_REG(hw) hw->interrupt_enable_reg.val
#else #else
# define INT_ENA_REG(hw) hw->interrupt_enable.val # define INT_ENA_REG(hw) hw->interrupt_enable.val
#endif /* CONFIG_ARCH_CHIP_ESP32C3_GENERIC */ #endif /* CONFIG_ARCH_CHIP_ESP32C3 */
#if !SOC_RCC_IS_INDEPENDENT #if !SOC_RCC_IS_INDEPENDENT
# define TWAI_RCC_ATOMIC() PERIPH_RCC_ATOMIC() # define TWAI_RCC_ATOMIC() PERIPH_RCC_ATOMIC()
arch/risc-v/src/esp32c3-legacy/Kconfig
+2 -2
View File
@@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository. # see the file kconfig-language.txt in the NuttX tools repository.
# #
if ARCH_CHIP_ESP32C3 if ARCH_CHIP_ESP32C3_LEGACY
comment "ESP32-C3 Configuration Options" comment "ESP32-C3 Configuration Options"
@@ -1218,4 +1218,4 @@ config ESP32C3_BROWNOUT_DET_LVL
endmenu # ESP32C3_BROWNOUT_DET endmenu # ESP32C3_BROWNOUT_DET
endif # ARCH_CHIP_ESP32C3 endif # ARCH_CHIP_ESP32C3_LEGACY
arch/risc-v/src/esp32c3/Kconfig
+2 -2
View File
@@ -3,8 +3,8 @@
# see the file kconfig-language.txt in the NuttX tools repository. # see the file kconfig-language.txt in the NuttX tools repository.
# #
if ARCH_CHIP_ESP32C3_GENERIC if ARCH_CHIP_ESP32C3
source "arch/risc-v/src/common/espressif/Kconfig" source "arch/risc-v/src/common/espressif/Kconfig"
endif # ARCH_CHIP_ESP32C3_GENERIC endif # ARCH_CHIP_ESP32C3