From 5dc2a15077b2f9527df8585abe0b6e008bbcf764 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 14 Feb 2016 19:14:56 +0100
Subject: [PATCH] boot: wrap up logo branding

Time is ticking.... tick tock tick tock :)
---
 sys/boot/forth/Makefile.inc                                | 4 ++--
 sys/boot/forth/beastie.4th                                 | 4 ++--
 sys/boot/forth/{logo-portal.4th => logo-hourglass.4th}     | 5 ++---
 sys/boot/forth/{logo-portalbw.4th => logo-hourglassbw.4th} | 5 ++---
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename sys/boot/forth/{logo-portal.4th => logo-hourglass.4th} (93%)
 rename sys/boot/forth/{logo-portalbw.4th => logo-hourglassbw.4th} (93%)

diff --git a/sys/boot/forth/Makefile.inc b/sys/boot/forth/Makefile.inc
index 932d63bbfed..6bfa3a92ce7 100644
--- a/sys/boot/forth/Makefile.inc
+++ b/sys/boot/forth/Makefile.inc
@@ -14,10 +14,10 @@ FILES+=	loader.help
 FILES+=	logo-beastie.4th
 FILES+=	logo-beastiebw.4th
 FILES+=	logo-fbsdbw.4th
+FILES+=	logo-hourglass.4th
+FILES+=	logo-hourglassbw.4th
 FILES+=	logo-orb.4th
 FILES+=	logo-orbbw.4th
-FILES+=	logo-portal.4th
-FILES+=	logo-portalbw.4th
 FILES+=	menu.4th
 FILES+=	menu-commands.4th
 FILES+=	menusets.4th
diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index cc38eecee87..c9ae7d62c7c 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -64,9 +64,9 @@ variable logoY
 		s" loader_logo" getenv dup -1 = over 0= or if
 			dup 0= if 2drop else drop then \ getenv result unused
 			loader_color? if
-				s" try-include /boot/logo-portal.4th"
+				s" try-include /boot/logo-hourglass.4th"
 			else
-				s" try-include /boot/logo-portalbw.4th"
+				s" try-include /boot/logo-hourglassbw.4th"
 			then
 		else
 			2drop ( c-addr/u -- ) \ getenv result unused
diff --git a/sys/boot/forth/logo-portal.4th b/sys/boot/forth/logo-hourglass.4th
similarity index 93%
rename from sys/boot/forth/logo-portal.4th
rename to sys/boot/forth/logo-hourglass.4th
index 1520801cb70..34b69f7bd9d 100644
--- a/sys/boot/forth/logo-portal.4th
+++ b/sys/boot/forth/logo-hourglass.4th
@@ -25,7 +25,7 @@
 \
 \ $FreeBSD$
 
-48 logoX ! 8 logoY ! \ Initialize logo placement defaults
+48 logoX ! 9 logoY ! \ Initialize logo placement defaults
 
 : logo+ ( x y c-addr/u -- x y' )
 	2swap 2dup at-xy 2swap \ position the cursor
@@ -34,9 +34,8 @@
 	1+ \ increase y for next time we're called
 ;
 
-: logo ( x y -- ) \ color portal logo (15 rows x 30 columns)
+: logo ( x y -- ) \ color hourglass logo (15 rows x 32 columns)
 
-	s"                               " logo+
 	s" #[37;1m  @@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
 	s" @@@@@                    @@@@@" logo+
diff --git a/sys/boot/forth/logo-portalbw.4th b/sys/boot/forth/logo-hourglassbw.4th
similarity index 93%
rename from sys/boot/forth/logo-portalbw.4th
rename to sys/boot/forth/logo-hourglassbw.4th
index 41fe3032a14..df777b7b0a7 100644
--- a/sys/boot/forth/logo-portalbw.4th
+++ b/sys/boot/forth/logo-hourglassbw.4th
@@ -25,7 +25,7 @@
 \
 \ $FreeBSD$
 
-48 logoX ! 8 logoY ! \ Initialize logo placement defaults
+48 logoX ! 9 logoY ! \ Initialize logo placement defaults
 
 : logo+ ( x y c-addr/u -- x y' )
 	2swap 2dup at-xy 2swap \ position the cursor
@@ -33,9 +33,8 @@
 	1+ \ increase y for next time we're called
 ;
 
-: logo ( x y -- ) \ B/W portal logo (15 rows x 30 columns)
+: logo ( x y -- ) \ B/W hourglass logo (15 rows x 32 columns)
 
-	s"                               " logo+
 	s"   @@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
 	s" @@@@@                    @@@@@" logo+