Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/common/Kconfig b/common/Kconfig
index 307265108263aa4dd663651ee8d1f039d2d74b98..2d86dd7e63c6cd9ee9aeb968fb41f8556261dadd 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -775,9 +775,16 @@ config TPL_LOG_CONSOLE
          log message is shown - other details like level, category, file and
          line number are omitted.
 
+config LOG_SYSLOG
+       bool "Log output to syslog server"
+       depends on LOG && NET
+       help
+         Enables a log driver which broadcasts log records via UDP port 514
+         to syslog servers.
+
 config LOG_TEST
        bool "Provide a test for logging"
-       depends on LOG
+       depends on LOG && UNIT_TEST
        default y if SANDBOX
        help
          This enables a 'log test' command to test logging. It is normally
@@ -925,6 +932,16 @@ config LAST_STAGE_INIT
          U-Boot calls last_stage_init() before the command-line interpreter is
          started.
 
+config PCI_INIT_R
+       bool "Enumerate PCI buses during init"
+       depends on PCI
+       default y if !DM_PCI
+       help
+         With this option U-Boot will call pci_init() soon after relocation,
+         which will enumerate PCI buses. This is needed, for instance, in the
+         case of DM PCI-based Ethernet devices, which will not be detected
+         without having the enumeration performed earlier.
+
 endmenu
 
 menu "Security support"
@@ -1053,3 +1070,14 @@ config IMAGE_SIGN_INFO
        select SHA256
        help
          Enable image_sign_info helper functions.
+
+if IMAGE_SIGN_INFO
+
+config SPL_IMAGE_SIGN_INFO
+       bool
+       select SHA1
+       select SHA256
+       help
+         Enable image_sign_info helper functions in SPL.
+
+endif