configs: Resync with savedefconfig

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index 9b8a8077993a1d4c6125988f890c0067dfef0240..166e7841b11f6c343650744ce3e3f753d923c8a7 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -69,20 +69,32 @@ config DISTRO_DEFAULTS
        imply USE_BOOTCOMMAND
        select CMD_BOOTZ if ARM && !ARM64
        select CMD_BOOTI if ARM64
-       select CMD_DHCP
-       select CMD_PXE
+       select CMD_DHCP if NET
+       select CMD_PXE if NET
        select CMD_EXT2
        select CMD_EXT4
        select CMD_FAT
        select CMD_FS_GENERIC
-       select CMD_MII
-       select CMD_PING
+       select CMD_MII if NET
+       select CMD_PING if NET
        select CMD_PART
        select HUSH_PARSER
        help
          Select this to enable various options and commands which are suitable
          for building u-boot for booting general purpose Linux distributions.
 
+config SYS_BOOT_GET_CMDLINE
+       bool "Enable kernel command line setup"
+       help
+         Enables allocating and saving kernel cmdline in space between
+         "bootm_low" and "bootm_low" + BOOTMAPSZ.
+
+config SYS_BOOT_GET_KBD
+       bool "Enable kernel board information setup"
+       help
+         Enables allocating and saving a kernel copy of the bd_info in
+         space between "bootm_low" and "bootm_low" + BOOTMAPSZ.
+
 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
        default y if DM