Make sure that we explicitly state the /chosen package for the words in the boot process that require it.
Signed-off-by: Mark Cave-Ayland mark.cave-ayland@siriusit.co.uk --- openbios-devel/forth/admin/userboot.fs | 6 ++++-- openbios-devel/forth/debugging/client.fs | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/openbios-devel/forth/admin/userboot.fs b/openbios-devel/forth/admin/userboot.fs index dd76958..e6ff9ab 100644 --- a/openbios-devel/forth/admin/userboot.fs +++ b/openbios-devel/forth/admin/userboot.fs @@ -12,8 +12,10 @@ then
\ Execute platform-specific boot code, e.g. kernel - s" platform-boot" $find if - execute + s" platform-boot" s" /chosen" find-package if + find-method if + execute + then then
(encode-bootpath) \ Setup bootpath/bootargs diff --git a/openbios-devel/forth/debugging/client.fs b/openbios-devel/forth/debugging/client.fs index f964ed0..45a931e 100644 --- a/openbios-devel/forth/debugging/client.fs +++ b/openbios-devel/forth/debugging/client.fs @@ -147,11 +147,12 @@ variable file-size then
\ Call the architecture-specific code to launch the client image - s" (go)" $find if - execute - else - ." go is not yet implemented" - 2drop + s" (go)" s" /chosen" find-package if + find-method if + execute + else + ." go is not yet implemented" + then then ;