| Message ID | 20170426030937.2569-1-aik@ozlabs.ru |
|---|---|
| State | Superseded |
| Headers | show |
On 26.04.2017 05:09, Alexey Kardashevskiy wrote: > This removes old ugly logo to save precious boot cycles and make it > easier to do automation scripts. This removes logo for both QEMU and JS2x > boards. This also removes some spaces from the standard banner. > > While we are here, this updates a year in the copyright notice. > > Suggested-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > board-js2x/slof/OF.fs | 3 +-- > board-qemu/slof/OF.fs | 6 +----- > board-qemu/slof/copyright-oss.fs | 2 +- > slof/fs/banner.fs | 4 ++-- > slof/fs/slof-logo.fs | 20 -------------------- > 5 files changed, 5 insertions(+), 30 deletions(-) > delete mode 100644 slof/fs/slof-logo.fs > > diff --git a/board-js2x/slof/OF.fs b/board-js2x/slof/OF.fs > index a51f473..be6c810 100644 > --- a/board-js2x/slof/OF.fs > +++ b/board-js2x/slof/OF.fs > @@ -173,10 +173,9 @@ THEN > > 200 cp > > -#include <slof-logo.fs> > #include <banner.fs> > > -: .banner .slof-logo .banner ; > +: .banner .banner ; You can now simply remove that line. There's no need to define a new function ".banner" that just calls the old function named ".banner". > \ Get the secondary CPUs into our own spinloop. > f8000050 rl@ CONSTANT master-cpu > diff --git a/board-qemu/slof/OF.fs b/board-qemu/slof/OF.fs > index 5959003..45f1243 100644 > --- a/board-qemu/slof/OF.fs > +++ b/board-qemu/slof/OF.fs > @@ -70,13 +70,9 @@ cistack ciregs >r1 ! \ kernel wants a stack :-) > > 200 cp > > -#include <slof-logo.fs> > - > -201 cp > - > #include <banner.fs> > > -: .banner .slof-logo .banner ; > +: .banner .banner ; dito > 220 cp > > diff --git a/board-qemu/slof/copyright-oss.fs b/board-qemu/slof/copyright-oss.fs > index e45b194..e315b1c 100644 > --- a/board-qemu/slof/copyright-oss.fs > +++ b/board-qemu/slof/copyright-oss.fs > @@ -10,7 +10,7 @@ > \ * IBM Corporation - initial implementation > \ ****************************************************************************/ > > -cr .( Copyright (c) char ) emit .( 2004, 2011 IBM Corporation All rights reserved.) > +cr .( Copyright (c) char ) emit .( 2004, 2017 IBM Corporation All rights reserved.) > cr .( This program and the accompanying materials are made available) > cr .( under the terms of the BSD License available at) > cr .( http://www.opensource.org/licenses/bsd-license.php) > diff --git a/slof/fs/banner.fs b/slof/fs/banner.fs > index d8bf406..7dfe079 100644 > --- a/slof/fs/banner.fs > +++ b/slof/fs/banner.fs > @@ -11,8 +11,8 @@ > \ ****************************************************************************/ > > : banner > - cr ." Type 'boot' and press return to continue booting the system." > - cr ." Type 'reset-all' and press return to reboot the system." > + cr ." Type 'boot' and press return to continue booting the system." > + cr ." Type 'reset-all' and press return to reboot the system." > cr cr > ; > > diff --git a/slof/fs/slof-logo.fs b/slof/fs/slof-logo.fs > deleted file mode 100644 > index 53d3184..0000000 > --- a/slof/fs/slof-logo.fs > +++ /dev/null > @@ -1,20 +0,0 @@ > -\ ***************************************************************************** > -\ * Copyright (c) 2004, 2008 IBM Corporation > -\ * All rights reserved. > -\ * This program and the accompanying materials > -\ * are made available under the terms of the BSD License > -\ * which accompanies this distribution, and is available at > -\ * http://www.opensource.org/licenses/bsd-license.php > -\ * > -\ * Contributors: > -\ * IBM Corporation - initial implementation > -\ ****************************************************************************/ > - > -: .slof-logo > - cr ." ..`. .. ....... .. ...... ......." > - cr ." ..`...`''.`'. .''``````..''. .`''```''`. `''``````" > - cr ." .`` .:' ': `''..... .''. ''` .''..''......." > - cr ." ``.':.';. ``````''`.''. .''. ''``''`````'`" > - cr ." ``.':':` .....`''.`'`...... `'`.....`''.`'` " > - cr ." .`.`'`` .'`'`````. ``'''''' ``''`'''`. `'` " > -; > With the two ": .banner .banner ;" lines removed: Reviewed-by: Thomas Huth <thuth@redhat.com>
On 26/04/17 13:14, Thomas Huth wrote: > On 26.04.2017 05:09, Alexey Kardashevskiy wrote: >> This removes old ugly logo to save precious boot cycles and make it >> easier to do automation scripts. This removes logo for both QEMU and JS2x >> boards. This also removes some spaces from the standard banner. >> >> While we are here, this updates a year in the copyright notice. >> >> Suggested-by: Thomas Huth <thuth@redhat.com> >> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> >> --- >> board-js2x/slof/OF.fs | 3 +-- >> board-qemu/slof/OF.fs | 6 +----- >> board-qemu/slof/copyright-oss.fs | 2 +- >> slof/fs/banner.fs | 4 ++-- >> slof/fs/slof-logo.fs | 20 -------------------- >> 5 files changed, 5 insertions(+), 30 deletions(-) >> delete mode 100644 slof/fs/slof-logo.fs >> >> diff --git a/board-js2x/slof/OF.fs b/board-js2x/slof/OF.fs >> index a51f473..be6c810 100644 >> --- a/board-js2x/slof/OF.fs >> +++ b/board-js2x/slof/OF.fs >> @@ -173,10 +173,9 @@ THEN >> >> 200 cp >> >> -#include <slof-logo.fs> >> #include <banner.fs> >> >> -: .banner .slof-logo .banner ; >> +: .banner .banner ; > > You can now simply remove that line. There's no need to define a new > function ".banner" that just calls the old function named ".banner". > >> \ Get the secondary CPUs into our own spinloop. >> f8000050 rl@ CONSTANT master-cpu >> diff --git a/board-qemu/slof/OF.fs b/board-qemu/slof/OF.fs >> index 5959003..45f1243 100644 >> --- a/board-qemu/slof/OF.fs >> +++ b/board-qemu/slof/OF.fs >> @@ -70,13 +70,9 @@ cistack ciregs >r1 ! \ kernel wants a stack :-) >> >> 200 cp >> >> -#include <slof-logo.fs> >> - >> -201 cp >> - >> #include <banner.fs> >> >> -: .banner .slof-logo .banner ; >> +: .banner .banner ; > > dito > >> 220 cp >> >> diff --git a/board-qemu/slof/copyright-oss.fs b/board-qemu/slof/copyright-oss.fs >> index e45b194..e315b1c 100644 >> --- a/board-qemu/slof/copyright-oss.fs >> +++ b/board-qemu/slof/copyright-oss.fs >> @@ -10,7 +10,7 @@ >> \ * IBM Corporation - initial implementation >> \ ****************************************************************************/ >> >> -cr .( Copyright (c) char ) emit .( 2004, 2011 IBM Corporation All rights reserved.) >> +cr .( Copyright (c) char ) emit .( 2004, 2017 IBM Corporation All rights reserved.) >> cr .( This program and the accompanying materials are made available) >> cr .( under the terms of the BSD License available at) >> cr .( http://www.opensource.org/licenses/bsd-license.php) >> diff --git a/slof/fs/banner.fs b/slof/fs/banner.fs >> index d8bf406..7dfe079 100644 >> --- a/slof/fs/banner.fs >> +++ b/slof/fs/banner.fs >> @@ -11,8 +11,8 @@ >> \ ****************************************************************************/ >> >> : banner >> - cr ." Type 'boot' and press return to continue booting the system." >> - cr ." Type 'reset-all' and press return to reboot the system." >> + cr ." Type 'boot' and press return to continue booting the system." >> + cr ." Type 'reset-all' and press return to reboot the system." >> cr cr >> ; >> >> diff --git a/slof/fs/slof-logo.fs b/slof/fs/slof-logo.fs >> deleted file mode 100644 >> index 53d3184..0000000 >> --- a/slof/fs/slof-logo.fs >> +++ /dev/null >> @@ -1,20 +0,0 @@ >> -\ ***************************************************************************** >> -\ * Copyright (c) 2004, 2008 IBM Corporation >> -\ * All rights reserved. >> -\ * This program and the accompanying materials >> -\ * are made available under the terms of the BSD License >> -\ * which accompanies this distribution, and is available at >> -\ * http://www.opensource.org/licenses/bsd-license.php >> -\ * >> -\ * Contributors: >> -\ * IBM Corporation - initial implementation >> -\ ****************************************************************************/ >> - >> -: .slof-logo >> - cr ." ..`. .. ....... .. ...... ......." >> - cr ." ..`...`''.`'. .''``````..''. .`''```''`. `''``````" >> - cr ." .`` .:' ': `''..... .''. ''` .''..''......." >> - cr ." ``.':.';. ``````''`.''. .''. ''``''`````'`" >> - cr ." ``.':':` .....`''.`'`...... `'`.....`''.`'` " >> - cr ." .`.`'`` .'`'`````. ``'''''' ``''`'''`. `'` " >> -; >> > > With the two ": .banner .banner ;" lines removed: > > Reviewed-by: Thomas Huth <thuth@redhat.com> Thanks, I pushed it to github.
diff --git a/board-js2x/slof/OF.fs b/board-js2x/slof/OF.fs index a51f473..be6c810 100644 --- a/board-js2x/slof/OF.fs +++ b/board-js2x/slof/OF.fs @@ -173,10 +173,9 @@ THEN 200 cp -#include <slof-logo.fs> #include <banner.fs> -: .banner .slof-logo .banner ; +: .banner .banner ; \ Get the secondary CPUs into our own spinloop. f8000050 rl@ CONSTANT master-cpu diff --git a/board-qemu/slof/OF.fs b/board-qemu/slof/OF.fs index 5959003..45f1243 100644 --- a/board-qemu/slof/OF.fs +++ b/board-qemu/slof/OF.fs @@ -70,13 +70,9 @@ cistack ciregs >r1 ! \ kernel wants a stack :-) 200 cp -#include <slof-logo.fs> - -201 cp - #include <banner.fs> -: .banner .slof-logo .banner ; +: .banner .banner ; 220 cp diff --git a/board-qemu/slof/copyright-oss.fs b/board-qemu/slof/copyright-oss.fs index e45b194..e315b1c 100644 --- a/board-qemu/slof/copyright-oss.fs +++ b/board-qemu/slof/copyright-oss.fs @@ -10,7 +10,7 @@ \ * IBM Corporation - initial implementation \ ****************************************************************************/ -cr .( Copyright (c) char ) emit .( 2004, 2011 IBM Corporation All rights reserved.) +cr .( Copyright (c) char ) emit .( 2004, 2017 IBM Corporation All rights reserved.) cr .( This program and the accompanying materials are made available) cr .( under the terms of the BSD License available at) cr .( http://www.opensource.org/licenses/bsd-license.php) diff --git a/slof/fs/banner.fs b/slof/fs/banner.fs index d8bf406..7dfe079 100644 --- a/slof/fs/banner.fs +++ b/slof/fs/banner.fs @@ -11,8 +11,8 @@ \ ****************************************************************************/ : banner - cr ." Type 'boot' and press return to continue booting the system." - cr ." Type 'reset-all' and press return to reboot the system." + cr ." Type 'boot' and press return to continue booting the system." + cr ." Type 'reset-all' and press return to reboot the system." cr cr ; diff --git a/slof/fs/slof-logo.fs b/slof/fs/slof-logo.fs deleted file mode 100644 index 53d3184..0000000 --- a/slof/fs/slof-logo.fs +++ /dev/null @@ -1,20 +0,0 @@ -\ ***************************************************************************** -\ * Copyright (c) 2004, 2008 IBM Corporation -\ * All rights reserved. -\ * This program and the accompanying materials -\ * are made available under the terms of the BSD License -\ * which accompanies this distribution, and is available at -\ * http://www.opensource.org/licenses/bsd-license.php -\ * -\ * Contributors: -\ * IBM Corporation - initial implementation -\ ****************************************************************************/ - -: .slof-logo - cr ." ..`. .. ....... .. ...... ......." - cr ." ..`...`''.`'. .''``````..''. .`''```''`. `''``````" - cr ." .`` .:' ': `''..... .''. ''` .''..''......." - cr ." ``.':.';. ``````''`.''. .''. ''``''`````'`" - cr ." ``.':':` .....`''.`'`...... `'`.....`''.`'` " - cr ." .`.`'`` .'`'`````. ``'''''' ``''`'''`. `'` " -;
This removes old ugly logo to save precious boot cycles and make it easier to do automation scripts. This removes logo for both QEMU and JS2x boards. This also removes some spaces from the standard banner. While we are here, this updates a year in the copyright notice. Suggested-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- board-js2x/slof/OF.fs | 3 +-- board-qemu/slof/OF.fs | 6 +----- board-qemu/slof/copyright-oss.fs | 2 +- slof/fs/banner.fs | 4 ++-- slof/fs/slof-logo.fs | 20 -------------------- 5 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 slof/fs/slof-logo.fs