| Message ID | 20170426041552.2628-1-aik@ozlabs.ru |
|---|---|
| State | Superseded |
| Headers | show |
On 26.04.2017 06:15, Alexey Kardashevskiy wrote: > 126e458fdc00 assumes that checkpoints are always printed from > the beginning of a line which is not the case when SLOF detects > a kernel image in check-boot-from-ram. When this happens, SLOF prints > a diagnostic message: > Detected RAM kernel at 400000 (180c3bc bytes) > > Without 126e458fdc00, SLOF prints another checkpoint at the end of > the message, then it clears the last checkpoint with ." " and > we see a nice message. With 126e458fdc00, we see: > ted RAM kernel at 400000 (180c3bc bytes) C08FF > > This adds "cr" to prevent the message from spoiling. > > Fixes: 126e458fdc00 ("libbootmsg: Do not use '\b' characters when printing checkpoints") > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > board-qemu/slof/OF.fs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board-qemu/slof/OF.fs b/board-qemu/slof/OF.fs > index 5be56ed..2a6e33f 100644 > --- a/board-qemu/slof/OF.fs > +++ b/board-qemu/slof/OF.fs > @@ -288,7 +288,7 @@ set-default-console > swap 20 << or to direct-ram-boot-size > swap 20 << or to direct-ram-boot-base > ." Detected RAM kernel at " direct-ram-boot-base . > - ." (" direct-ram-boot-size . ." bytes) " > + ." (" direct-ram-boot-size . ." bytes) " cr > \ Override the boot-command word without touching the > \ nvram environment > s" boot-command" $create " (boot-ram)" env-string > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/board-qemu/slof/OF.fs b/board-qemu/slof/OF.fs index 5be56ed..2a6e33f 100644 --- a/board-qemu/slof/OF.fs +++ b/board-qemu/slof/OF.fs @@ -288,7 +288,7 @@ set-default-console swap 20 << or to direct-ram-boot-size swap 20 << or to direct-ram-boot-base ." Detected RAM kernel at " direct-ram-boot-base . - ." (" direct-ram-boot-size . ." bytes) " + ." (" direct-ram-boot-size . ." bytes) " cr \ Override the boot-command word without touching the \ nvram environment s" boot-command" $create " (boot-ram)" env-string
126e458fdc00 assumes that checkpoints are always printed from the beginning of a line which is not the case when SLOF detects a kernel image in check-boot-from-ram. When this happens, SLOF prints a diagnostic message: Detected RAM kernel at 400000 (180c3bc bytes) Without 126e458fdc00, SLOF prints another checkpoint at the end of the message, then it clears the last checkpoint with ." " and we see a nice message. With 126e458fdc00, we see: ted RAM kernel at 400000 (180c3bc bytes) C08FF This adds "cr" to prevent the message from spoiling. Fixes: 126e458fdc00 ("libbootmsg: Do not use '\b' characters when printing checkpoints") Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- board-qemu/slof/OF.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)