mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/kconfig_corrections' into 'master'
Fix Kconfig issues discovered by upstream Kconfiglib See merge request espressif/esp-idf!6183
This commit is contained in:
commit
3d8798f745
@ -388,7 +388,7 @@ menu "Security features"
|
|||||||
config SECURE_BOOT_SIGNING_KEY
|
config SECURE_BOOT_SIGNING_KEY
|
||||||
string "Secure boot private signing key"
|
string "Secure boot private signing key"
|
||||||
depends on SECURE_BOOT_BUILD_SIGNED_BINARIES
|
depends on SECURE_BOOT_BUILD_SIGNED_BINARIES
|
||||||
default secure_boot_signing_key.pem
|
default "secure_boot_signing_key.pem"
|
||||||
help
|
help
|
||||||
Path to the key file used to sign app images.
|
Path to the key file used to sign app images.
|
||||||
|
|
||||||
@ -404,7 +404,7 @@ menu "Security features"
|
|||||||
config SECURE_BOOT_VERIFICATION_KEY
|
config SECURE_BOOT_VERIFICATION_KEY
|
||||||
string "Secure boot public signature verification key"
|
string "Secure boot public signature verification key"
|
||||||
depends on SECURE_SIGNED_APPS && !SECURE_BOOT_BUILD_SIGNED_BINARIES
|
depends on SECURE_SIGNED_APPS && !SECURE_BOOT_BUILD_SIGNED_BINARIES
|
||||||
default signature_verification_key.bin
|
default "signature_verification_key.bin"
|
||||||
help
|
help
|
||||||
Path to a public key file used to verify signed images. This key is compiled into the bootloader and/or
|
Path to a public key file used to verify signed images. This key is compiled into the bootloader and/or
|
||||||
app, to verify app images.
|
app, to verify app images.
|
||||||
@ -418,7 +418,7 @@ menu "Security features"
|
|||||||
choice SECURE_BOOTLOADER_KEY_ENCODING
|
choice SECURE_BOOTLOADER_KEY_ENCODING
|
||||||
bool "Hardware Key Encoding"
|
bool "Hardware Key Encoding"
|
||||||
depends on SECURE_BOOTLOADER_REFLASHABLE
|
depends on SECURE_BOOTLOADER_REFLASHABLE
|
||||||
default SECURE_BOOTLOADER_NO_ENCODING
|
default SECURE_BOOTLOADER_KEY_ENCODING_256BIT
|
||||||
help
|
help
|
||||||
|
|
||||||
In reflashable secure bootloader mode, a hardware key is derived from the signing key (with SHA-256) and
|
In reflashable secure bootloader mode, a hardware key is derived from the signing key (with SHA-256) and
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
menu Bluetooth
|
menu "Bluetooth"
|
||||||
|
|
||||||
config BT_ENABLED
|
config BT_ENABLED
|
||||||
bool "Bluetooth"
|
bool "Bluetooth"
|
||||||
|
@ -9,7 +9,7 @@ menu "eFuse Bit Manager"
|
|||||||
config EFUSE_CUSTOM_TABLE_FILENAME
|
config EFUSE_CUSTOM_TABLE_FILENAME
|
||||||
string "Custom eFuse CSV file"
|
string "Custom eFuse CSV file"
|
||||||
depends on EFUSE_CUSTOM_TABLE
|
depends on EFUSE_CUSTOM_TABLE
|
||||||
default main/esp_efuse_custom_table.csv
|
default "main/esp_efuse_custom_table.csv"
|
||||||
help
|
help
|
||||||
Name of the custom eFuse CSV filename. This path is evaluated
|
Name of the custom eFuse CSV filename. This path is evaluated
|
||||||
relative to the project root directory.
|
relative to the project root directory.
|
||||||
|
@ -117,7 +117,7 @@ menu "ESP32-specific"
|
|||||||
|
|
||||||
choice SPIRAM_SPEED
|
choice SPIRAM_SPEED
|
||||||
prompt "Set RAM clock speed"
|
prompt "Set RAM clock speed"
|
||||||
default SPIRAM_CACHE_SPEED_40M
|
default SPIRAM_SPEED_40M
|
||||||
help
|
help
|
||||||
Select the speed for the SPI RAM chip.
|
Select the speed for the SPI RAM chip.
|
||||||
If SPI RAM is enabled, we only support three combinations of SPI speed mode we supported now:
|
If SPI RAM is enabled, we only support three combinations of SPI speed mode we supported now:
|
||||||
@ -487,7 +487,7 @@ menu "ESP32-specific"
|
|||||||
choice ESP32_BROWNOUT_DET_LVL_SEL
|
choice ESP32_BROWNOUT_DET_LVL_SEL
|
||||||
prompt "Brownout voltage level"
|
prompt "Brownout voltage level"
|
||||||
depends on ESP32_BROWNOUT_DET
|
depends on ESP32_BROWNOUT_DET
|
||||||
default BROWNOUT_DET_LVL_SEL_25
|
default ESP32_BROWNOUT_DET_LVL_SEL_0
|
||||||
help
|
help
|
||||||
The brownout detector will reset the chip when the supply voltage is approximately
|
The brownout detector will reset the chip when the supply voltage is approximately
|
||||||
below this level. Note that there may be some variation of brownout voltage level
|
below this level. Note that there may be some variation of brownout voltage level
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
menu Wi-Fi
|
menu "Wi-Fi"
|
||||||
|
|
||||||
config ESP32_WIFI_SW_COEXIST_ENABLE
|
config ESP32_WIFI_SW_COEXIST_ENABLE
|
||||||
bool "Software controls WiFi/Bluetooth coexistence"
|
bool "Software controls WiFi/Bluetooth coexistence"
|
||||||
@ -240,7 +240,7 @@ menu Wi-Fi
|
|||||||
choice ESP32_WIFI_DEBUG_LOG_LEVEL
|
choice ESP32_WIFI_DEBUG_LOG_LEVEL
|
||||||
depends on ESP32_WIFI_DEBUG_LOG_ENABLE
|
depends on ESP32_WIFI_DEBUG_LOG_ENABLE
|
||||||
prompt "WiFi debug log level"
|
prompt "WiFi debug log level"
|
||||||
default ESP32_WIFI_LOG_DEBUG
|
default ESP32_WIFI_DEBUG_LOG_DEBUG
|
||||||
help
|
help
|
||||||
The WiFi log is divided into the following levels: ERROR,WARNING,INFO,DEBUG,VERBOSE.
|
The WiFi log is divided into the following levels: ERROR,WARNING,INFO,DEBUG,VERBOSE.
|
||||||
The ERROR,WARNING,INFO levels are enabled by default, and the DEBUG,VERBOSE levels can be enabled here.
|
The ERROR,WARNING,INFO levels are enabled by default, and the DEBUG,VERBOSE levels can be enabled here.
|
||||||
@ -318,7 +318,7 @@ menu Wi-Fi
|
|||||||
|
|
||||||
endmenu # Wi-Fi
|
endmenu # Wi-Fi
|
||||||
|
|
||||||
menu PHY
|
menu "PHY"
|
||||||
|
|
||||||
config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
|
config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
|
||||||
bool "Store phy calibration data in NVS"
|
bool "Store phy calibration data in NVS"
|
||||||
|
@ -19,7 +19,7 @@ menu "FreeRTOS"
|
|||||||
|
|
||||||
choice FREERTOS_CORETIMER
|
choice FREERTOS_CORETIMER
|
||||||
prompt "Xtensa timer to use as the FreeRTOS tick source"
|
prompt "Xtensa timer to use as the FreeRTOS tick source"
|
||||||
default CONFIG_FREERTOS_CORETIMER_0
|
default FREERTOS_CORETIMER_0
|
||||||
help
|
help
|
||||||
FreeRTOS needs a timer with an associated interrupt to use as
|
FreeRTOS needs a timer with an associated interrupt to use as
|
||||||
the main tick source to increase counters, run timers and do
|
the main tick source to increase counters, run timers and do
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
menu NVS
|
menu "NVS"
|
||||||
|
|
||||||
config NVS_ENCRYPTION
|
config NVS_ENCRYPTION
|
||||||
bool "Enable NVS encryption"
|
bool "Enable NVS encryption"
|
||||||
|
@ -33,7 +33,7 @@ menu "OpenSSL"
|
|||||||
|
|
||||||
choice OPENSSL_ASSERT
|
choice OPENSSL_ASSERT
|
||||||
prompt "Select OpenSSL assert function"
|
prompt "Select OpenSSL assert function"
|
||||||
default CONFIG_OPENSSL_ASSERT_EXIT
|
default OPENSSL_ASSERT_EXIT
|
||||||
help
|
help
|
||||||
OpenSSL function needs "assert" function to check if input parameters are valid.
|
OpenSSL function needs "assert" function to check if input parameters are valid.
|
||||||
|
|
||||||
|
@ -22,17 +22,17 @@ menu "Partition Table"
|
|||||||
|
|
||||||
config PARTITION_TABLE_CUSTOM_FILENAME
|
config PARTITION_TABLE_CUSTOM_FILENAME
|
||||||
string "Custom partition CSV file" if PARTITION_TABLE_CUSTOM
|
string "Custom partition CSV file" if PARTITION_TABLE_CUSTOM
|
||||||
default partitions.csv
|
default "partitions.csv"
|
||||||
help
|
help
|
||||||
Name of the custom partition CSV filename. This path is evaluated
|
Name of the custom partition CSV filename. This path is evaluated
|
||||||
relative to the project root directory.
|
relative to the project root directory.
|
||||||
|
|
||||||
config PARTITION_TABLE_FILENAME
|
config PARTITION_TABLE_FILENAME
|
||||||
string
|
string
|
||||||
default partitions_singleapp.csv if PARTITION_TABLE_SINGLE_APP && !ESP32_ENABLE_COREDUMP_TO_FLASH
|
default "partitions_singleapp.csv" if PARTITION_TABLE_SINGLE_APP && !ESP32_ENABLE_COREDUMP_TO_FLASH
|
||||||
default partitions_singleapp_coredump.csv if PARTITION_TABLE_SINGLE_APP && ESP32_ENABLE_COREDUMP_TO_FLASH
|
default "partitions_singleapp_coredump.csv" if PARTITION_TABLE_SINGLE_APP && ESP32_ENABLE_COREDUMP_TO_FLASH
|
||||||
default partitions_two_ota.csv if PARTITION_TABLE_TWO_OTA && !ESP32_ENABLE_COREDUMP_TO_FLASH
|
default "partitions_two_ota.csv" if PARTITION_TABLE_TWO_OTA && !ESP32_ENABLE_COREDUMP_TO_FLASH
|
||||||
default partitions_two_ota_coredump.csv if PARTITION_TABLE_TWO_OTA && ESP32_ENABLE_COREDUMP_TO_FLASH
|
default "partitions_two_ota_coredump.csv" if PARTITION_TABLE_TWO_OTA && ESP32_ENABLE_COREDUMP_TO_FLASH
|
||||||
default PARTITION_TABLE_CUSTOM_FILENAME if PARTITION_TABLE_CUSTOM
|
default PARTITION_TABLE_CUSTOM_FILENAME if PARTITION_TABLE_CUSTOM
|
||||||
|
|
||||||
config PARTITION_TABLE_OFFSET
|
config PARTITION_TABLE_OFFSET
|
||||||
|
Loading…
Reference in New Issue
Block a user