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

x86: Don't process the kernel command line unless enabled

Browse Source 
If the 'bootm' command is not enabled then this code is not available and
this causes a link error. Fix it.

Note that for the EFI app, there is no indication of missing code. It just
hangs!

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Simon Glass 2021-12-29 11:57:39 -07:00 committed by Heinrich Schuchardt
parent 6e7ad4a45f
commit 440c6645aa
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/lib/zimage.c
View File

@ -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);