aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini2023-10-26 14:31:25 -0400
committerTom Rini2023-11-07 14:49:09 -0500
commit9d298c96afc64f76c54057d924cf4a2ea5fac5ea (patch)
tree0ba0f43ef764b8b9042e5f5b062bd7696f3688cb
parent2180a454fc961f3eb7c88eeb95a6507ef6a0bedb (diff)
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>
-rw-r--r--boot/Kconfig11
-rw-r--r--cmd/Kconfig11
2 files changed, 11 insertions, 11 deletions
diff --git a/boot/Kconfig b/boot/Kconfig
index 9ffcfb8ad81..93787232381 100644
--- 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 1ba6a38e783..ba6bfe6fbb9 100644
--- 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