aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/main.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-08-02 19:21:22 -0400
committerH. Peter Anvin <hpa@zytor.com>2010-08-02 23:32:20 -0400
commit8fee13a48e4879fba57725f6d9513df4bfa8e9f3 (patch)
tree77a12d8f6b5feb8991e2816bb065c48021a8f8bc /arch/x86/boot/main.c
parentf4ed2877b16e8146427306aea8819adac5c88374 (diff)
x86, setup: enable early console output from the decompressor
This enables the decompressor output to be seen on the serial console. Most of the code is shared with the regular boot code. We could add printf to the decompressor if needed, but currently there is no sufficiently compelling user. -v2: define BOOT_BOOT_H to avoid include boot.h -v3: early_serial_base need to be static in misc.c ? -v4: create seperate string.c printf.c cmdline.c early_serial_console.c after hpa's patch that allow global variables in compressed/misc stage -v5: remove printf.c related Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/main.c')
-rw-r--r--arch/x86/boot/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index 4ef1a33e8572..40358c8905be 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -132,6 +132,8 @@ void main(void)
132 132
133 /* Initialize the early-boot console */ 133 /* Initialize the early-boot console */
134 console_init(); 134 console_init();
135 if (cmdline_find_option_bool("debug"))
136 puts("early console in setup code\n");
135 137
136 /* End of heap check */ 138 /* End of heap check */
137 init_heap(); 139 init_heap();
@@ -171,10 +173,6 @@ void main(void)
171 /* Set the video mode */ 173 /* Set the video mode */
172 set_video(); 174 set_video();
173 175
174 /* Parse command line for 'quiet' and pass it to decompressor. */
175 if (cmdline_find_option_bool("quiet"))
176 boot_params.hdr.loadflags |= QUIET_FLAG;
177
178 /* Do the last things and invoke protected mode */ 176 /* Do the last things and invoke protected mode */
179 go_to_protected_mode(); 177 go_to_protected_mode();
180} 178}