Merge tag 'v2021.10-rc4' into next

[pandora-u-boot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index ee14d3a..0543b83 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -548,6 +548,12 @@ config MISC_INIT_R
        help
          Enabling this option calls 'misc_init_r' function
 
+config ID_EEPROM
+       bool "Enable I2C connected system identifier EEPROM"
+       help
+         A number of different systems and vendors enable a vendor-specified
+         EEPROM that contains various identifying features.
+
 config PCI_INIT_R
        bool "Enumerate PCI buses during init"
        depends on PCI
@@ -627,7 +633,6 @@ config TPL_HASH
 
 config STACKPROTECTOR
        bool "Stack Protector buffer overflow detection"
-       default n
        help
          Enable stack smash detection through compiler's stack-protector
          canary logic
@@ -635,12 +640,10 @@ config STACKPROTECTOR
 config SPL_STACKPROTECTOR
        bool "Stack Protector buffer overflow detection for SPL"
        depends on STACKPROTECTOR && SPL
-       default n
 
 config TPL_STACKPROTECTOR
        bool "Stack Protector buffer overflow detection for TPL"
        depends on STACKPROTECTOR && TPL
-       default n
 
 endmenu
 
@@ -648,7 +651,6 @@ menu "Update support"
 
 config UPDATE_COMMON
        bool
-       default n
        select DFU_WRITE_ALT
 
 config UPDATE_TFTP
@@ -680,7 +682,6 @@ config UPDATE_FIT
 
 config ANDROID_AB
        bool "Android A/B updates"
-       default n
        help
          If enabled, adds support for the new Android A/B update model. This
          allows the bootloader to select which slot to boot from based on the