Move DISTRO_DEFAULTS into boot/

This relates to booting so move it in to that Kconfig file, before
changing it.

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

diff --git a/Kconfig b/Kconfig
index a75cce7e28fb07b12d805b0af6779f879f32212b..b8f65589f457cd5c1ceaef57c4a19bc59427e217 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -191,33 +191,6 @@ config XEN
 
          [1] - https://xenproject.org/
 
-config DISTRO_DEFAULTS
-       bool "Select defaults suitable for booting general purpose Linux distributions"
-       select AUTO_COMPLETE
-       select CMDLINE_EDITING
-       select CMD_BOOTI if ARM64
-       select CMD_BOOTZ if ARM && !ARM64
-       select CMD_DHCP if CMD_NET
-       select CMD_ENV_EXISTS
-       select CMD_EXT2
-       select CMD_EXT4
-       select CMD_FAT
-       select CMD_FS_GENERIC
-       select CMD_PART if PARTITIONS
-       select CMD_PING if CMD_NET
-       select CMD_PXE if NET
-       select CMD_SYSBOOT
-       select ENV_VARS_UBOOT_CONFIG
-       select HUSH_PARSER
-       select SUPPORT_RAW_INITRD
-       select SYS_LONGHELP
-       imply CMD_MII if NET
-       imply USB_STORAGE
-       imply USE_BOOTCOMMAND
-       help
-         Select this to enable various options and commands which are suitable
-         for building u-boot for booting general purpose Linux distributions.
-
 config ENV_VARS_UBOOT_CONFIG
        bool "Add arch, board, vendor and soc variables to default environment"
        help

diff --git a/boot/Kconfig b/boot/Kconfig
index 5f491625c820801d616ba12eb143f2879937a958..170ab63f27dc6b6e6f5f6c9df214704ed1133883 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -820,6 +820,33 @@ config SYS_BOOT_RAMDISK_HIGH
 
 endmenu                # Boot images
 
+config DISTRO_DEFAULTS
+       bool "Select defaults suitable for booting general purpose Linux distributions"
+       select AUTO_COMPLETE
+       select CMDLINE_EDITING
+       select CMD_BOOTI if ARM64
+       select CMD_BOOTZ if ARM && !ARM64
+       select CMD_DHCP if CMD_NET
+       select CMD_ENV_EXISTS
+       select CMD_EXT2
+       select CMD_EXT4
+       select CMD_FAT
+       select CMD_FS_GENERIC
+       select CMD_PART if PARTITIONS
+       select CMD_PING if CMD_NET
+       select CMD_PXE if NET
+       select CMD_SYSBOOT
+       select ENV_VARS_UBOOT_CONFIG
+       select HUSH_PARSER
+       select SUPPORT_RAW_INITRD
+       select SYS_LONGHELP
+       imply CMD_MII if NET
+       imply USB_STORAGE
+       imply USE_BOOTCOMMAND
+       help
+         Select this to enable various options and commands which are suitable
+         for building u-boot for booting general purpose Linux distributions.
+
 menu "Boot timing"
 
 config BOOTSTAGE