This relates to booting so move it in to that Kconfig file, before
changing it.
Signed-off-by: Simon Glass <s...@chromium.org>
---
Changes in v2:
- Add new patch to move DISTRO_DEFAULTS into boot/
Kconfig | 27 ---------------------------
boot/Kconfig | 28 +++++++++++++++++++++++++++-
2 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/Kconfig b/Kconfig
index a75cce7e28f..b8f65589f45 100644
--- 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 8759b863b00..7815341ada7 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -408,7 +408,6 @@ if BOOTSTD
config BOOTSTD_DEFAULTS
bool "Select some common defaults for standard boot"
- depends on BOOTSTD
default y
imply USE_BOOTCOMMAND
# Bring in some defaults which are generally needed. Boards can drop
@@ -821,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
--
2.40.0.rc0.216.gc4246ad0f0-goog
