boot: Move some other fdt-fixup options to the same menu

Move more options relating to fixing up a device tree into the new
devicetree-fixup menu.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/boot/Kconfig b/boot/Kconfig
index 39c51e9e2fe8ec845bb7946f4b047b1808cc4824..f8b8d6089511e600cb9174560023de4e3f2d0fd0 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -696,35 +696,6 @@ config SUPPORT_RAW_INITRD
          address of the initrd must be augmented by it's size, in the following
          format: "<initrd address>:<initrd size>".
 
-config OF_BOARD_SETUP
-       bool "Set up board-specific details in device tree before boot"
-       depends on OF_LIBFDT
-       help
-         This causes U-Boot to call ft_board_setup() before booting into
-         the Operating System. This function can set up various
-         board-specific information in the device tree for use by the OS.
-         The device tree is then passed to the OS.
-
-config OF_SYSTEM_SETUP
-       bool "Set up system-specific details in device tree before boot"
-       depends on OF_LIBFDT
-       help
-         This causes U-Boot to call ft_system_setup() before booting into
-         the Operating System. This function can set up various
-         system-specific information in the device tree for use by the OS.
-         The device tree is then passed to the OS.
-
-config OF_STDOUT_VIA_ALIAS
-       bool "Update the device-tree stdout alias from U-Boot"
-       depends on OF_LIBFDT
-       help
-         This uses U-Boot's serial alias from the aliases node to update
-         the device tree passed to the OS. The "linux,stdout-path" property
-         in the chosen node is set to point to the correct serial node.
-         This option currently references CONFIG_CONS_INDEX, which is
-         incorrect when used with device tree as this option does not
-         exist / should not be used.
-
 config HAVE_TEXT_BASE
        bool
        depends on !NIOS2 && !XTENSA
@@ -1542,6 +1513,32 @@ if OF_LIBFDT
 
 menu "Devicetree fixup"
 
+config OF_BOARD_SETUP
+       bool "Set up board-specific details in device tree before boot"
+       help
+         This causes U-Boot to call ft_board_setup() before booting into
+         the Operating System. This function can set up various
+         board-specific information in the device tree for use by the OS.
+         The device tree is then passed to the OS.
+
+config OF_SYSTEM_SETUP
+       bool "Set up system-specific details in device tree before boot"
+       help
+         This causes U-Boot to call ft_system_setup() before booting into
+         the Operating System. This function can set up various
+         system-specific information in the device tree for use by the OS.
+         The device tree is then passed to the OS.
+
+config OF_STDOUT_VIA_ALIAS
+       bool "Update the device-tree stdout alias from U-Boot"
+       help
+         This uses U-Boot's serial alias from the aliases node to update
+         the device tree passed to the OS. The "linux,stdout-path" property
+         in the chosen node is set to point to the correct serial node.
+         This option currently references CONFIG_CONS_INDEX, which is
+         incorrect when used with device tree as this option does not
+         exist / should not be used.
+
 config FDT_SIMPLEFB
        bool "FDT tools for simplefb support"
        help