diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-10 17:06:27 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-10 17:06:27 -0600 |
| commit | 777c28460947371ada40868dc994dfe8537d7115 (patch) | |
| tree | ed76982806de141ac6bcbc303b3167f90e8877e7 /cmd | |
| parent | ab3453e7b12daef47b9e91da2a2a3d48615dc6fc (diff) | |
| parent | cf70f75447133c497f9e5c56f2b33c8f2d3f08b5 (diff) | |
| download | u-boot-777c28460947371ada40868dc994dfe8537d7115.zip u-boot-777c28460947371ada40868dc994dfe8537d7115.tar.gz u-boot-777c28460947371ada40868dc994dfe8537d7115.tar.bz2 | |
Merge patch series "pxe: Allow extlinux booting without CMDLINE enabled"
Simon Glass <sjg@chromium.org> says:
This series is the culmanation of the current line of refactoring
series. It adjusts pxe to call the booting functionality directly
rather than going through the command-line interface.
With this is is possible to boot using the extlinux bootmeth without
the command line enabled.
It also updates fastboot to do a similar thing.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 50 | ||||
| -rw-r--r-- | cmd/fastboot.c | 2 |
2 files changed, 2 insertions, 50 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 2e56354..3830519 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -262,6 +262,7 @@ config CMD_BOOTD config CMD_BOOTM bool "bootm" + depends on BOOTM default y help Boot an application image from the memory. @@ -333,48 +334,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 @@ -391,13 +350,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 diff --git a/cmd/fastboot.c b/cmd/fastboot.c index c3c1923..792e83d 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -159,7 +159,7 @@ NXTARG: return CMD_RET_USAGE; } - fastboot_init((void *)buf_addr, buf_size); + fastboot_init(buf_addr, buf_size); if (!strcmp(argv[1], "udp")) return do_fastboot_udp(argc, argv, buf_addr, buf_size); |