3 files changed, 34 insertions, 19 deletions

diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index 3c8f29d400596..240730cb4891a 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -205,21 +205,9 @@ variable logoY
 	s" loader_logo" getenv dup -1 = if
 		logoX @ logoY @
 		loader_color? if
-			s" tribute-logo"
-			sfind if
-				execute
-			else
-				drop
-				orb-logo
-			then
+			orb-logo
 		else
-			s" tributebw-logo"
-			sfind if
-				execute
-			else
-				drop
-				orbbw-logo
-			then
+			orbbw-logo
 		then
 		drop exit
 	then
@@ -249,7 +237,7 @@ variable logoY
 		s" tribute-logo" sfind if
 			execute
 		else
-			orb-logo
+			drop orb-logo
 		then
 		2drop exit
 	then
@@ -258,7 +246,7 @@ variable logoY
 		s" tributebw-logo" sfind if
 			execute
 		else
-			orbbw-logo
+			drop orbbw-logo
 		then
 		2drop exit
 	then
diff --git a/sys/boot/forth/version.4th b/sys/boot/forth/version.4th
index 358b6b12ef842..16795dce064e1 100644
--- a/sys/boot/forth/version.4th
+++ b/sys/boot/forth/version.4th
@@ -29,6 +29,9 @@ marker task-version.4th
 variable versionX
 variable versionY
 
+\ Default $loader_version value if not overridden or using tribute screen
+: str_loader_version ( -- C-ADDR/U|-1 ) -1 ;
+
 \ Initialize text placement to defaults
 80 versionX !	\ NOTE: this is the ending column (text is right-justified)
 24 versionY !
@@ -43,9 +46,33 @@ variable versionY
 		?number drop versionY ! -1
 	then drop
 
-	\ Exit if a version was not set
+	\ Default version if none was set
 	s" loader_version" getenv dup -1 = if
-		drop exit
+		drop
+		\ Default version if no logo is requested
+		s" loader_logo" getenv dup -1 = if
+			drop str_loader_version
+		else
+			2dup s" tribute" compare-insensitive 0= if
+				2drop
+				s" tribute-logo" sfind if
+					drop exit \ see beastie tribute-text
+				else
+					drop str_loader_version
+				then
+			else 2dup s" tributebw" compare-insensitive 0= if
+				2drop
+				s" tributebw-logo" sfind if
+					drop exit \ see beastie tribute-text
+				else
+					drop str_loader_version
+				then
+			else
+				2drop str_loader_version
+			then then
+		then
+	then dup -1 = if
+		drop exit \ default version (above) is disabled
 	then
 
 	\ Right justify the text
diff --git a/sys/boot/forth/version.4th.8 b/sys/boot/forth/version.4th.8
index efa6aa66b71a6..fe8b61808c9a4 100644
--- a/sys/boot/forth/version.4th.8
+++ b/sys/boot/forth/version.4th.8
@@ -91,7 +91,7 @@ causes the version to be printed without color
 .Pq default is ANSI Cyan .
 .El
 .Sh FILES
-.Bl -tag -width /boot/loader.4th -compact
+.Bl -tag -width /boot/version.4th -compact
 .It Pa /boot/loader
 The
 .Xr loader 8 .