summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/boot/forth/beastie.4th1
-rw-r--r--sys/boot/forth/color.4th.83
-rw-r--r--sys/boot/forth/loader.4th7
3 files changed, 8 insertions, 3 deletions
diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index 5c1ca81..68d47f6 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -28,7 +28,6 @@
marker task-beastie.4th
-include /boot/color.4th
include /boot/delay.4th
variable logoX
diff --git a/sys/boot/forth/color.4th.8 b/sys/boot/forth/color.4th.8
index d0233ed..5b6baf0 100644
--- a/sys/boot/forth/color.4th.8
+++ b/sys/boot/forth/color.4th.8
@@ -50,7 +50,7 @@ through the command:
.Dl include color.4th
.Pp
This line is present in
-.Pa /boot/beastie.4th
+.Pa /boot/loader.4th
file, so it is not needed (and should not be re-issued) in a normal setup.
.Pp
The commands provided by it are:
@@ -102,7 +102,6 @@ loader_color="YES"
.Sh SEE ALSO
.Xr loader.conf 5 ,
.Xr loader 8 ,
-.Xr beastie.4th 8 ,
.Xr loader.4th 8
.Sh HISTORY
The
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index 437533a..e252cfe 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -40,6 +40,7 @@ s" arch-i386" environment? [if] [if]
2048 dictincrease ! \ 2048 additional cells each time
include /boot/support.4th
+include /boot/color.4th
only forth also support-functions also builtins definitions
@@ -64,6 +65,12 @@ only forth also support-functions also builtins definitions
: boot
0= if ( interpreted ) get_arguments then
+ loader_color? if
+ ." Booting..." cr
+ else
+ ." Booting..." cr
+ then
+
\ Unload only if a path was passed
dup if
>r over r> swap
OpenPOWER on IntegriCloud