Kconfig: Move startup hooks under init options

These hooks relate to U-Boot init so move them under that menu.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/Kconfig b/common/Kconfig
index 3aa8cf3..1955dd6 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -442,16 +442,6 @@ config MISC_INIT_R
        help
          Enabling this option calls 'misc_init_r' function
 
-config VERSION_VARIABLE
-       bool "add U-Boot environment variable vers"
-       default n
-       help
-         If this variable is defined, an environment variable
-         named "ver" is created by U-Boot showing the U-Boot
-         version as printed by the "version" command.
-         Any change to this variable will be reverted at the
-         next reset.
-
 config BOARD_LATE_INIT
        bool "Execute Board late init"
        help
@@ -485,27 +475,6 @@ config DISPLAY_BOARDINFO_LATE
          the relocation phase. The board function checkboard() is called to do
          this.
 
-endmenu                # Init options
-
-config BOUNCE_BUFFER
-       bool "Include bounce buffer API"
-       help
-         Some peripherals support DMA from a subset of physically
-         addressable memory only.  To support such peripherals, the
-         bounce buffer API uses a temporary buffer: it copies data
-         to/from DMA regions while managing cache operations.
-
-         A second possible use of bounce buffers is their ability to
-         provide aligned buffers for DMA operations.
-
-config BOARD_TYPES
-       bool "Call get_board_type() to get and display the board type"
-       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.
-
 menu "Start-up hooks"
 
 config ARCH_EARLY_INIT_R
@@ -561,6 +530,37 @@ config PCI_INIT_R
 
 endmenu
 
+endmenu                # Init options
+
+config VERSION_VARIABLE
+       bool "add U-Boot environment variable vers"
+       default n
+       help
+         If this variable is defined, an environment variable
+         named "ver" is created by U-Boot showing the U-Boot
+         version as printed by the "version" command.
+         Any change to this variable will be reverted at the
+         next reset.
+
+config BOUNCE_BUFFER
+       bool "Include bounce buffer API"
+       help
+         Some peripherals support DMA from a subset of physically
+         addressable memory only.  To support such peripherals, the
+         bounce buffer API uses a temporary buffer: it copies data
+         to/from DMA regions while managing cache operations.
+
+         A second possible use of bounce buffers is their ability to
+         provide aligned buffers for DMA operations.
+
+config BOARD_TYPES
+       bool "Call get_board_type() to get and display the board type"
+       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.
+
 menu "Security support"
 
 config HASH