Fix Kconfig issues discovered by upstream Kconfiglib

diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild
index 3aaa3eaf8c4cdd11069bec15b67a0a6246f94bb6..c46a310776510a3ea587f41fb9c6dac221706712 100644 (file)
--- a/components/bootloader/Kconfig.projbuild
+++ b/components/bootloader/Kconfig.projbuild
@@ -388,7 +388,7 @@ menu "Security features"
     config SECURE_BOOT_SIGNING_KEY
         string "Secure boot private signing key"
         depends on SECURE_BOOT_BUILD_SIGNED_BINARIES
-        default secure_boot_signing_key.pem
+        default "secure_boot_signing_key.pem"
         help
             Path to the key file used to sign app images.
 
@@ -404,7 +404,7 @@ menu "Security features"
     config SECURE_BOOT_VERIFICATION_KEY
         string "Secure boot public signature verification key"
         depends on SECURE_SIGNED_APPS && !SECURE_BOOT_BUILD_SIGNED_BINARIES
-        default signature_verification_key.bin
+        default "signature_verification_key.bin"
         help
             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.
@@ -418,7 +418,7 @@ menu "Security features"
     choice SECURE_BOOTLOADER_KEY_ENCODING
         bool "Hardware Key Encoding"
         depends on SECURE_BOOTLOADER_REFLASHABLE
-        default SECURE_BOOTLOADER_NO_ENCODING
+        default SECURE_BOOTLOADER_KEY_ENCODING_256BIT
         help
 
             In reflashable secure bootloader mode, a hardware key is derived from the signing key (with SHA-256) and

diff --git a/components/bt/Kconfig b/components/bt/Kconfig
index 8553cc9f70af1b74d372c66aeaff0ce6b34cb035..a1ab51c7496b470dbc6381f25b786168280d853f 100644 (file)
--- a/components/bt/Kconfig
+++ b/components/bt/Kconfig
@@ -1,4 +1,4 @@
-menu Bluetooth
+menu "Bluetooth"
 
     config BT_ENABLED
         bool "Bluetooth"

diff --git a/components/efuse/Kconfig b/components/efuse/Kconfig
index bf40e2dfc26ea98ee542b17dbdd684ed706ed4d0..b4f83c8836abb475440a6495a92f35568df10964 100644 (file)
--- a/components/efuse/Kconfig
+++ b/components/efuse/Kconfig
@@ -9,7 +9,7 @@ menu "eFuse Bit Manager"
     config EFUSE_CUSTOM_TABLE_FILENAME
         string "Custom eFuse CSV file"
         depends on EFUSE_CUSTOM_TABLE
-        default main/esp_efuse_custom_table.csv
+        default "main/esp_efuse_custom_table.csv"
         help
             Name of the custom eFuse CSV filename. This path is evaluated
             relative to the project root directory.

diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index 5a512f56276ff55db870a007a6085898a56f56c3..acc3f073ccdcb8a72ecb91419d69e7531a893a94 100644 (file)
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -117,7 +117,7 @@ menu "ESP32-specific"
 
         choice SPIRAM_SPEED
             prompt "Set RAM clock speed"
-            default SPIRAM_CACHE_SPEED_40M
+            default SPIRAM_SPEED_40M
             help
                 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:
@@ -487,7 +487,7 @@ menu "ESP32-specific"
     choice ESP32_BROWNOUT_DET_LVL_SEL
         prompt "Brownout voltage level"
         depends on ESP32_BROWNOUT_DET
-        default BROWNOUT_DET_LVL_SEL_25
+        default ESP32_BROWNOUT_DET_LVL_SEL_0
         help
             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

diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig
index 104d12ce7dc0b1469008aea1d776a7acd7097afd..2b19873cbbdb4ec2a1a668fb4767fffc7aa5790b 100644 (file)
--- a/components/esp_wifi/Kconfig
+++ b/components/esp_wifi/Kconfig
@@ -1,5 +1,5 @@
 
-menu Wi-Fi
+menu "Wi-Fi"
 
     config ESP32_WIFI_SW_COEXIST_ENABLE
         bool "Software controls WiFi/Bluetooth coexistence"
@@ -240,7 +240,7 @@ menu Wi-Fi
     choice ESP32_WIFI_DEBUG_LOG_LEVEL
         depends on ESP32_WIFI_DEBUG_LOG_ENABLE
         prompt "WiFi debug log level"
-        default ESP32_WIFI_LOG_DEBUG
+        default ESP32_WIFI_DEBUG_LOG_DEBUG
         help
             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.
@@ -318,7 +318,7 @@ menu Wi-Fi
 
 endmenu  # Wi-Fi
 
-menu PHY
+menu "PHY"
 
     config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
         bool "Store phy calibration data in NVS"

diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig
index bf6317d45e070c73a65abdba4af4143c08c9d2c1..1341dc10cd1c5ebb0e445e6b585f82588fb19345 100644 (file)
--- a/components/freertos/Kconfig
+++ b/components/freertos/Kconfig
@@ -19,7 +19,7 @@ menu "FreeRTOS"
 
     choice FREERTOS_CORETIMER
         prompt "Xtensa timer to use as the FreeRTOS tick source"
-        default CONFIG_FREERTOS_CORETIMER_0
+        default FREERTOS_CORETIMER_0
         help
             FreeRTOS needs a timer with an associated interrupt to use as
             the main tick source to increase counters, run timers and do

diff --git a/components/nvs_flash/Kconfig b/components/nvs_flash/Kconfig
index 0ae533d4ca5ba81f4dd4a16aa48b0768d929acf4..e39dc9cf72bb39522cb9692d4e5f80ed44891539 100644 (file)
--- a/components/nvs_flash/Kconfig
+++ b/components/nvs_flash/Kconfig
@@ -1,4 +1,4 @@
-menu NVS
+menu "NVS"
 
     config NVS_ENCRYPTION
         bool "Enable NVS encryption"

diff --git a/components/openssl/Kconfig b/components/openssl/Kconfig
index 0df49080c5d45b260f26f8aa447f8bb8f303bb77..7bb271f281e81a8b8283f6c3a3adb59e73c13255 100644 (file)
--- a/components/openssl/Kconfig
+++ b/components/openssl/Kconfig
@@ -33,7 +33,7 @@ menu "OpenSSL"
 
     choice OPENSSL_ASSERT
         prompt "Select OpenSSL assert function"
-        default CONFIG_OPENSSL_ASSERT_EXIT
+        default OPENSSL_ASSERT_EXIT
         help
             OpenSSL function needs "assert" function to check if input parameters are valid.
 

diff --git a/components/partition_table/Kconfig.projbuild b/components/partition_table/Kconfig.projbuild
index 326f7fb7c687a8ec28a6a6e8a0093209ab6a8599..6dfa8a56264e0614ada9f39e343cc598066297b5 100644 (file)
--- a/components/partition_table/Kconfig.projbuild
+++ b/components/partition_table/Kconfig.projbuild
@@ -22,17 +22,17 @@ menu "Partition Table"
 
     config PARTITION_TABLE_CUSTOM_FILENAME
         string "Custom partition CSV file" if PARTITION_TABLE_CUSTOM
-        default partitions.csv
+        default "partitions.csv"
         help
             Name of the custom partition CSV filename. This path is evaluated
             relative to the project root directory.
 
     config PARTITION_TABLE_FILENAME
         string
-        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_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_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_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 PARTITION_TABLE_CUSTOM_FILENAME if PARTITION_TABLE_CUSTOM
 
     config PARTITION_TABLE_OFFSET