bootm: Make OS booting dependent on BOOTM

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>

diff --git a/boot/Kconfig b/boot/Kconfig
index 8b32a51f7e7cbcd67192671459f99d6356b4ac67..9fa8789bc2b12253d3a77572089be1bac22f7ebf 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -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

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 16822c538b5875c5e6a70655f617946fe338df80..311b0c204283cafe4572367431974e1ac357134e 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -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