Embedded_Projects/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootm: Make OS booting dependent on BOOTM

Browse Source 
Booting an OS does not require the 'bootm' command, so change the
condition for these options.

Move them into boot/ so they don't depend on CMDLINE

Note that CMD_BOOTM_PRE_LOAD has been put directly into the bootm code
so will need some additional refactoring (and a test!) to allow it to
change over.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2023-12-14 21:19:01 -07:00 committed by Tom Rini
parent 6e558e34e0
commit b34c8289d2
2 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
boot/Kconfig
View File

@ -689,6 +689,55 @@ config BOOTM
This option should normally be enabled. It is used to implement the
'bootm' command.
config BOOTM_LINUX
bool "Support booting Linux OS images"
depends on BOOTM || CMD_BOOTZ || CMD_BOOTI
default y
help
Support booting the Linux kernel directly via a command such as bootm
or booti or bootz.
config BOOTM_NETBSD
bool "Support booting NetBSD (non-EFI) loader images"
depends on BOOTM
default y
help
Support booting NetBSD via the bootm command.
config BOOTM_OPENRTOS
bool "Support booting OPENRTOS / FreeRTOS images"
depends on BOOTM
help
Support booting OPENRTOS / FreeRTOS via the bootm command.
config BOOTM_OSE
bool "Support booting Enea OSE images"
depends on (ARM && (ARM64 || CPU_V7A || CPU_V7R) || SANDBOX || PPC || X86)
depends on BOOTM
help
Support booting Enea OSE images via the bootm command.
config BOOTM_PLAN9
bool "Support booting Plan9 OS images"
depends on BOOTM
default y
help
Support booting Plan9 images via the bootm command.
config BOOTM_RTEMS
bool "Support booting RTEMS OS images"
depends on BOOTM
default y
help
Support booting RTEMS images via the bootm command.
config BOOTM_VXWORKS
bool "Support booting VxWorks OS images"
depends on BOOTM
default y
help
Support booting VxWorks images via the bootm command.
config ANDROID_BOOT_IMAGE
bool "Android Boot Images"
default y if FASTBOOT

49
cmd/Kconfig
View File

@ -291,48 +291,6 @@ config CMD_BOOTI
help
Boot an AArch64 Linux Kernel image from memory.
config BOOTM_LINUX
bool "Support booting Linux OS images"
depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI
default y
help
Support booting the Linux kernel directly via a command such as bootm
or booti or bootz.
config BOOTM_NETBSD
bool "Support booting NetBSD (non-EFI) loader images"
depends on CMD_BOOTM
default y
help
Support booting NetBSD via the bootm command.
config BOOTM_OPENRTOS
bool "Support booting OPENRTOS / FreeRTOS images"
depends on CMD_BOOTM
help
Support booting OPENRTOS / FreeRTOS via the bootm command.
config BOOTM_OSE
bool "Support booting Enea OSE images"
depends on (ARM && (ARM64 || CPU_V7A || CPU_V7R) || SANDBOX || PPC || X86)
depends on CMD_BOOTM
help
Support booting Enea OSE images via the bootm command.
config BOOTM_PLAN9
bool "Support booting Plan9 OS images"
depends on CMD_BOOTM
default y
help
Support booting Plan9 images via the bootm command.
config BOOTM_RTEMS
bool "Support booting RTEMS OS images"
depends on CMD_BOOTM
default y
help
Support booting RTEMS images via the bootm command.
config CMD_SEAMA
bool "Support read SEAMA NAND images"
depends on MTD_RAW_NAND
@ -349,13 +307,6 @@ config CMD_VBE
is used to boot. Updating the parameters is not currently
supported.
config BOOTM_VXWORKS
bool "Support booting VxWorks OS images"
depends on CMD_BOOTM
default y
help
Support booting VxWorks images via the bootm command.
config CMD_BOOTEFI
bool "bootefi"
depends on EFI_LOADER