aboutsummaryrefslogtreecommitdiffstats
path: root/core/runkernel.inc
diff options
context:
space:
mode:
Diffstat (limited to 'core/runkernel.inc')
-rw-r--r--core/runkernel.inc18
1 files changed, 10 insertions, 8 deletions
diff --git a/core/runkernel.inc b/core/runkernel.inc
index f6ede382..e738706f 100644
--- a/core/runkernel.inc
+++ b/core/runkernel.inc
@@ -1,7 +1,7 @@
;; -----------------------------------------------------------------------
;;
;; Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
-;; Copyright 2009 Intel Corporation; author: H. Peter Anvin
+;; Copyright 2009-2010 Intel Corporation; author: H. Peter Anvin
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -140,16 +140,16 @@ parse_cmdline:
opt_vga:
mov ax,[es:di-1]
mov bx,-1
- cmp ax,'=nor' ; vga=normal
+ cmp ax,'=n' ; vga=normal
je .vc0
dec bx ; bx <- -2
- cmp ax,'=ext' ; vga=ext
+ cmp ax,'=e' ; vga=ext
je .vc0
dec bx ; bx <- -3
- cmp ax,'=ask' ; vga=ask
+ cmp ax,'=a' ; vga=ask
je .vc0
mov bx,0x0f04 ; bx <- 0x0f04 (current mode)
- cmp ax,'=cur' ; vga=current
+ cmp ax,'=c' ; vga=current
je .vc0
call parseint_esdi ; vga=<number>
jc .skip ; Not an integer
@@ -168,7 +168,7 @@ opt_mem:
ret
opt_quiet:
- mov byte [QuietBoot],1
+ mov byte [QuietBoot],QUIET_FLAG
ret
%if IS_PXELINUX
@@ -228,6 +228,8 @@ new_kernel:
; we were provided.
;
mov al,[es:su_loadflags]
+ or al,[QuietBoot] ; Set QUIET_FLAG if needed
+ mov [es:su_loadflags],al
mov [LoadFlags],al
any_kernel:
@@ -458,7 +460,7 @@ setup_move:
; BX points to the final real mode segment, and will be loaded
; into DS.
- test byte [QuietBoot],01h ; Don't clear the mode if quiet
+ test byte [QuietBoot],QUIET_FLAG
jz replace_bootstrap
jmp replace_bootstrap_noclearmode
@@ -631,7 +633,7 @@ loadinitrd:
; assumes CS == DS
;
writestr_qchk:
- test byte [QuietBoot],01h
+ test byte [QuietBoot],QUIET_FLAG
jz writestr
ret