x86: zimage: Add silent-console processing
At present zimage does its own command-line processing and does not
support the 'silent console' feature. There doesn't seem to be any good
reason for this.
Add support for silent console to zimage.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 50fb16d..f154827 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -15,6 +15,7 @@
#define LOG_CATEGORY LOGC_BOOT
#include <common.h>
+#include <bootm.h>
#include <command.h>
#include <env.h>
#include <irq_func.h>
@@ -330,7 +331,12 @@
}
if (cmd_line) {
+ int max_size = 0xff;
+ int ret;
+
log_debug("Setup cmdline\n");
+ if (bootproto >= 0x0206)
+ max_size = hdr->cmdline_size;
if (bootproto >= 0x0202) {
hdr->cmd_line_ptr = (uintptr_t)cmd_line;
} else if (bootproto >= 0x0200) {
@@ -346,6 +352,14 @@
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 (err=%d)\n", ret);
+ return ret;
+ }
+ printf("Kernel command line: \"");
+ puts(cmd_line);
+ printf("\"\n");
}
if (IS_ENABLED(CONFIG_INTEL_MID) && bootproto >= 0x0207)