[SLOF] [PATCH] qemu-bootlist: Take the "-boot strict=off" setting properly into account
segher at kernel.crashing.org
Wed Mar 1 10:58:17 AEDT 2017
On Tue, Feb 28, 2017 at 01:15:56PM +0100, Thomas Huth wrote:
> +++ b/board-qemu/slof/qemu-bootlist.fs
> @@ -28,12 +28,19 @@ defer add-boot-device
> : qemu-read-bootlist ( -- )
> \ See if QEMU has set exact boot device list
> " qemu,boot-list" get-chosen IF
> - s" boot-device" $setenv
> - EXIT
> + 1- \ Ignore the trailing NUL character
> + 2dup set-boot-device
> + \ strict boot order is enabled if the last word in qemu,boot-list
> + \ is "HALT". In that case, do not add other boot devices.
> + dup 4 > IF
> + + 4 - 4 s" HALT" str= IF EXIT THEN
This triggers also on words that end in HALT, like ASPHALT.
You probably should factor it to its own word, which also gets rid of
the following ELSE, etc.
> + ELSE
> + 2drop
> + THEN
More information about the SLOF