Ver código fonte

Fix Kconfig issues discovered by upstream Kconfiglib

Roland Dobai 6 anos atrás
pai
commit
fc738680f8

+ 3 - 3
components/bootloader/Kconfig.projbuild

@@ -338,7 +338,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.
 
@@ -354,7 +354,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.
@@ -368,7 +368,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

+ 1 - 1
components/bt/Kconfig

@@ -1,4 +1,4 @@
-menu Bluetooth
+menu "Bluetooth"
 
     config BT_ENABLED
         bool "Bluetooth"

+ 1 - 1
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.

+ 2 - 2
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

+ 3 - 3
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"

+ 1 - 1
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

+ 1 - 1
components/nvs_flash/Kconfig

@@ -1,4 +1,4 @@
-menu NVS
+menu "NVS"
 
     config NVS_ENCRYPTION
         bool "Enable NVS encryption"

+ 1 - 1
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.
 

+ 5 - 5
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