Merge tag 'v2023.04-rc4' into next

[platform/kernel/u-boot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 0afc01b..7ff6255 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -551,12 +551,11 @@ endmenu
 menu "Init options"
 
 config BOARD_TYPES
-       bool "Call get_board_type() to get and display the board type"
+       bool "Enable board_type entry in global data struct"
        help
-         If this option is enabled, checkboard() will call get_board_type()
-         to get a string containing the board type and this will be
-         displayed immediately after the model is shown on the console
-         early in boot.
+         If this option is enabled, a field will be added to the global
+         data struct to store an unsigned long value for the type of
+         platform that we have determined we are on, at run-time.
 
 config DISPLAY_CPUINFO
        bool "Display information about the CPU during start up"
@@ -631,10 +630,30 @@ config EVENT_DEBUG
          events, such as event-type names. This adds to the code size of
          U-Boot so can be turned off for production builds.
 
+config SPL_EVENT
+       bool  # General-purpose event-handling mechanism in SPL
+       depends on SPL
+       help
+         This adds a framework for general purpose sending and processing of
+         events, to allow interested parties to be alerted when something
+         happens. This is an attempt to stem the flow of weak functions,
+         hooks, functions in board_f.c and board_r.c and the Kconfig options
+         below.
+
+         See doc/develop/event.rst for more information.
+
+config SPL_EVENT_DYNAMIC
+       bool
+       depends on SPL_EVENT && EVENT_DYNAMIC
+       help
+         Enable this to support adding an event spy at runtime, without adding
+         it to the EVENT_SPY() linker list. This increases code size slightly
+         but provides more flexibility for boards and subsystems that need it.
+
 endif # EVENT
 
 config ARCH_EARLY_INIT_R
-       bool "Call arch-specific init soon after relocation"
+       bool
        help
          With this option U-Boot will call arch_early_init_r() soon after
          relocation. Driver model is running by this point, and the cache
@@ -1043,7 +1062,7 @@ choice
        prompt "Bloblist location in TPL"
        help
          Select the location of the bloblist, via various means. Typically
-         you should use the same value for SPL as for U-Boot, since they need
+         you should use the same value for TPL as for U-Boot, since they need
          to look in the same place. But if BLOBLIST_ALLOC is used, then a
          fresh bloblist will be created each time, since there is no shared
          address (between phases) for the bloblist.
@@ -1066,6 +1085,35 @@ endchoice
 
 endif # TPL_BLOBLIST
 
+if VPL_BLOBLIST
+
+choice
+       prompt "Bloblist location in VPL"
+       help
+         Select the location of the bloblist, via various means. Typically
+         you should use the same value for VPL as for U-Boot, since they need
+         to look in the same place. But if BLOBLIST_ALLOC is used, then a
+         fresh bloblist will be created each time, since there is no shared
+         address (between phases) for the bloblist.
+
+config VPL_BLOBLIST_FIXED
+       bool "Place bloblist at a fixed address in memory"
+       help
+         Select this to used a fixed memory address for the bloblist. If the
+         bloblist exists at this address from a previous phase, it used as is.
+         If not it is created at this address in VPL.
+
+config VPL_BLOBLIST_ALLOC
+       bool "Allocate bloblist"
+       help
+         Allocate the bloblist using malloc(). This avoids the need to
+         specify a fixed address on systems where this is unknown or can
+         change at runtime.
+
+endchoice
+
+endif # VPL_BLOBLIST
+
 endmenu
 
 source "common/spl/Kconfig"