Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions arch/arm/src/rp2040/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ config RP2040_PWM0A_INVERT

if RP2040_PWM_MULTICHAN && RP2040_PWM_NCHANNELS > 1

config RP2040_PWM0B_INVERT
config RP2040_PWM0B_INVERT
bool "PWM0 channel 2 invert"
default n
---help---
Expand All @@ -309,7 +309,7 @@ if RP2040_PWM_MULTICHAN && RP2040_PWM_NCHANNELS > 1

endif # RP2040_PWM_MULTICHAN && RP2040_PWM_NCHANNELS > 1

config RP2040_PWM0_PHASE_CORRECT
config RP2040_PWM0_PHASE_CORRECT
bool "PWM0 phase correct"
default n

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/rp23xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ config RP23XX_PWM0A_INVERT

if RP23XX_PWM_MULTICHAN && RP23XX_PWM_NCHANNELS > 1

config RP23XX_PWM0B_INVERT
config RP23XX_PWM0B_INVERT
bool "PWM0 channel 2 invert"
default n
---help---
Expand All @@ -322,7 +322,7 @@ if RP23XX_PWM_MULTICHAN && RP23XX_PWM_NCHANNELS > 1

endif # RP23XX_PWM_MULTICHAN && RP23XX_PWM_NCHANNELS > 1

config RP23XX_PWM0_PHASE_CORRECT
config RP23XX_PWM0_PHASE_CORRECT
bool "PWM0 phase correct"
default n

Expand Down
36 changes: 20 additions & 16 deletions arch/risc-v/src/common/espressif/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ config ESPRESSIF_SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC
bool "Leave UART bootloader encryption enabled"
depends on ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
default n
help
---help---
If not set (default), the bootloader will permanently disable UART bootloader encryption access on
first boot. If set, the UART bootloader will still be able to access hardware encryption.

Expand Down Expand Up @@ -290,12 +290,12 @@ choice ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE
Refer to the Flash Encryption section of the ESP-IDF Programmer's Guide for details:
https://docs.espressif.com/projects/esp-idf/en/latest/esp32/security/flash-encryption.html#flash-encryption-configuration

config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
bool "Development (NOT SECURE)"
select ESPRESSIF_SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC
config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
bool "Development (NOT SECURE)"
select ESPRESSIF_SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC

config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_RELEASE
bool "Release"
config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_RELEASE
bool "Release"

endchoice

Expand Down Expand Up @@ -1721,11 +1721,13 @@ choice ESPRESSIF_WIFI_MGMT_RX_BUFFER
If "Dynamic" is selected, each WiFi RX MGMT buffer is allocated as needed when a MGMT data frame is
received. The MGMT buffer is freed after the MGMT data frame has been processed by the WiFi driver.

config ESPRESSIF_WIFI_STATIC_RX_MGMT_BUFFER
bool "Static"
config ESPRESSIF_WIFI_DYNAMIC_RX_MGMT_BUFFER
bool "Dynamic"
endchoice
config ESPRESSIF_WIFI_STATIC_RX_MGMT_BUFFER
bool "Static"

config ESPRESSIF_WIFI_DYNAMIC_RX_MGMT_BUFFER
bool "Dynamic"

endchoice # ESPRESSIF_WIFI_MGMT_RX_BUFFER

config ESPRESSIF_WIFI_DYNAMIC_RX_MGMT_BUFFER_TYPE
int
Expand Down Expand Up @@ -1783,11 +1785,13 @@ choice ESPRESSIF_WIFI_TX_BUFFER

TODO: There is a special dependency for Dynamic if SPIRAM is enabled.

config ESPRESSIF_WIFI_STATIC_TX_BUFFER
bool "Static"
config ESPRESSIF_WIFI_DYNAMIC_TX_BUFFER
bool "Dynamic"
endchoice
config ESPRESSIF_WIFI_STATIC_TX_BUFFER
bool "Static"

config ESPRESSIF_WIFI_DYNAMIC_TX_BUFFER
bool "Dynamic"

endchoice # ESPRESSIF_WIFI_TX_BUFFER

config ESPRESSIF_WIFI_TX_BUFFER_TYPE
int
Expand Down
4 changes: 2 additions & 2 deletions arch/risc-v/src/rp23xx-rv/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ config RP23XX_RV_PWM0A_INVERT

if RP23XX_RV_PWM_MULTICHAN && RP23XX_RV_PWM_NCHANNELS > 1

config RP23XX_RV_PWM0B_INVERT
config RP23XX_RV_PWM0B_INVERT
bool "PWM0 channel 2 invert"
default n
---help---
Expand All @@ -313,7 +313,7 @@ if RP23XX_RV_PWM_MULTICHAN && RP23XX_RV_PWM_NCHANNELS > 1

endif # RP23XX_RV_PWM_MULTICHAN && RP23XX_RV_PWM_NCHANNELS > 1

config RP23XX_RV_PWM0_PHASE_CORRECT
config RP23XX_RV_PWM0_PHASE_CORRECT
bool "PWM0 phase correct"
default n

Expand Down
14 changes: 7 additions & 7 deletions arch/xtensa/src/common/espressif/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ config ESPRESSIF_SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC
bool "Leave UART bootloader encryption enabled"
depends on ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
default n
help
---help---
If not set (default), the bootloader will permanently disable UART bootloader encryption access on
first boot. If set, the UART bootloader will still be able to access hardware encryption.

Expand Down Expand Up @@ -449,14 +449,14 @@ choice ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE
Refer to the Flash Encryption section of the ESP-IDF Programmer's Guide for details:
https://docs.espressif.com/projects/esp-idf/en/latest/esp32/security/flash-encryption.html#flash-encryption-configuration

config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
bool "Development (NOT SECURE)"
select ESPRESSIF_SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC
config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
bool "Development (NOT SECURE)"
select ESPRESSIF_SECURE_FLASH_UART_BOOTLOADER_ALLOW_ENC

config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_RELEASE
bool "Release"
config ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE_RELEASE
bool "Release"

endchoice
endchoice # ESPRESSIF_SECURE_FLASH_ENCRYPTION_MODE

config ESPRESSIF_SECURE_FLASH_ENC_USE_HOST_KEY
bool "Require user provided encryption key for flash encryption"
Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/src/esp32/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ config ESP32_I2C1
default n
select ESP32_I2C

config ESP32_I2C_PERIPH_MASTER_MODE
config ESP32_I2C_PERIPH_MASTER_MODE
bool
depends on (ESP32_I2C0_MASTER_MODE || ESP32_I2C1_MASTER_MODE)
default n
Expand Down
52 changes: 27 additions & 25 deletions arch/xtensa/src/esp32s3/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1649,18 +1649,19 @@ choice ESP32S3_UNIVERSAL_MAC_ADDRESSES
a custom universal MAC address range, the correct setting will depend on the allocation of MAC
addresses in this range (either 2 or 4 per device.)

config ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO
bool "Two"
select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
select ESP_MAC_ADDR_UNIVERSE_BT

config ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR
bool "Four"
select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
select ESP_MAC_ADDR_UNIVERSE_WIFI_AP
select ESP_MAC_ADDR_UNIVERSE_BT
select ESP_MAC_ADDR_UNIVERSE_ETH
endchoice
config ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO
bool "Two"
select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
select ESP_MAC_ADDR_UNIVERSE_BT

config ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR
bool "Four"
select ESP_MAC_ADDR_UNIVERSE_WIFI_STA
select ESP_MAC_ADDR_UNIVERSE_WIFI_AP
select ESP_MAC_ADDR_UNIVERSE_BT
select ESP_MAC_ADDR_UNIVERSE_ETH

endchoice # ESP32S3_UNIVERSAL_MAC_ADDRESSES

config ESP32S3_UNIVERSAL_MAC_ADDRESSES
int
Expand Down Expand Up @@ -1916,22 +1917,23 @@ choice ESP32S3_FLASH_SIZE
depends on ARCH_CHIP_ESP32S3CUSTOM
default ESP32S3CUSTOM_FLASH_4M

config ESP32S3CUSTOM_FLASH_4M
bool "ESP32S3 Flash 4MB"
select ESP32S3_FLASH_4M
config ESP32S3CUSTOM_FLASH_4M
bool "ESP32S3 Flash 4MB"
select ESP32S3_FLASH_4M

config ESP32S3CUSTOM_FLASH_8M
bool "ESP32S3 Flash 8MB"
select ESP32S3_FLASH_8M
config ESP32S3CUSTOM_FLASH_8M
bool "ESP32S3 Flash 8MB"
select ESP32S3_FLASH_8M

config ESP32S3CUSTOM_FLASH_16M
bool "ESP32S3 Flash 16MB"
select ESP32S3_FLASH_16M
config ESP32S3CUSTOM_FLASH_16M
bool "ESP32S3 Flash 16MB"
select ESP32S3_FLASH_16M

config ESP32S3CUSTOM_FLASH_32M
bool "ESP32S3 Flash 32MB"
select ESP32S3_FLASH_32M
select ESP32S3_SPI_FLASH_USE_32BIT_ADDRESS

config ESP32S3CUSTOM_FLASH_32M
bool "ESP32S3 Flash 32MB"
select ESP32S3_FLASH_32M
select ESP32S3_SPI_FLASH_USE_32BIT_ADDRESS
endchoice # ESP32S3_FLASH_SIZE

config ESP32S3_HAVE_OTA_PARTITION
Expand Down
Loading