diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-31 07:28:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-31 07:28:36 -0500 |
| commit | 5fec3c853d5e6b998db66f586871839c408195a3 (patch) | |
| tree | c3368f8625b3a9383f30745ce1fafafc35cafac3 /arch/x86/lib/zimage.c | |
| parent | 87a9aa604de8a4a50642e25b88af328ab375893b (diff) | |
| parent | 86bb48880d75653d692cd02edb81888a2ed2dbb2 (diff) | |
Merge tag 'efi-next' of https://source.denx.de/u-boot/custodians/u-boot-efi into next
Pull request of efi-next
Documentation:
* Add Sunxi board description
UEFI:
* Improvements to U-Boot running on top of UEFI
Diffstat (limited to 'arch/x86/lib/zimage.c')
| -rw-r--r-- | arch/x86/lib/zimage.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 7ce02226ef9..9cc04490307 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -365,11 +365,14 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, strcpy(cmd_line, (char *)cmdline_force); else build_command_line(cmd_line, auto_boot); - ret = bootm_process_cmdline(cmd_line, max_size, BOOTM_CL_ALL); - if (ret) { - printf("Cmdline setup failed (max_size=%x, bootproto=%x, err=%d)\n", - max_size, bootproto, ret); - return ret; + if (IS_ENABLED(CONFIG_CMD_BOOTM)) { + ret = bootm_process_cmdline(cmd_line, max_size, + BOOTM_CL_ALL); + if (ret) { + printf("Cmdline setup failed (max_size=%x, bootproto=%x, err=%d)\n", + max_size, bootproto, ret); + return ret; + } } printf("Kernel command line: \""); puts(cmd_line); |