boot: Move SYS_BOOTM_LEN to be by LEGACY_IMAGE_FORMAT

This particular option is required for booting all image types,
regardless of if we are starting an OS via command line or something
else.  Move the question for SYS_BOOTM_LEN to be by the question for
LEGACY_IMAGE_FORMAT, as that's where our generic OS questions start.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/boot/Kconfig b/boot/Kconfig
index 9ffcfb8ad812193eeff662446e0dc331a12c2871..93787232381887875b9f4b00322b3508a0fc77f1 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -724,6 +724,17 @@ if MEASURED_BOOT
          event log memory region.
 endif # MEASURED_BOOT
 
+config SYS_BOOTM_LEN
+       hex "Maximum size of a decompresed OS image"
+       depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ || \
+               LEGACY_IMAGE_FORMAT || SPL_LEGACY_IMAGE_FORMAT
+       default 0x4000000 if PPC || ARM64
+       default 0x1000000 if X86 || ARCH_MX6 || ARCH_MX7
+       default 0x800000
+       help
+         This is the maximum size of the buffer that is used to decompress the OS
+         image in to if attempting to boot a compressed image.
+
 config SUPPORT_RAW_INITRD
        bool "Enable raw initrd images"
        help

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 1ba6a38e78338c13a3dc8b50ca143358fb90fadd..ba6bfe6fbb9597afe81bf5468937aa2b3a9bd228 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -360,17 +360,6 @@ config BOOTM_VXWORKS
        help
          Support booting VxWorks images via the bootm command.
 
-config SYS_BOOTM_LEN
-       hex "Maximum size of a decompresed OS image"
-       depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ || \
-                  LEGACY_IMAGE_FORMAT || SPL_LEGACY_IMAGE_FORMAT
-       default 0x4000000 if PPC || ARM64
-       default 0x1000000 if X86 || ARCH_MX6 || ARCH_MX7
-       default 0x800000
-       help
-         This is the maximum size of the buffer that is used to decompress the OS
-         image in to, if passing a compressed image to bootm/booti/bootz.
-
 config CMD_BOOTEFI
        bool "bootefi"
        depends on EFI_LOADER