From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y85FK-0006ga-Im for barebox@lists.infradead.org; Mon, 05 Jan 2015 10:50:51 +0000 Date: Mon, 5 Jan 2015 11:50:28 +0100 From: Sascha Hauer Message-ID: <20150105105028.GP30369@pengutronix.de> References: <20141223170709.GA15818@ns203013.ovh.net> <1419358918-25569-1-git-send-email-plagnioj@jcrosoft.com> <1419358918-25569-9-git-send-email-plagnioj@jcrosoft.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1419358918-25569-9-git-send-email-plagnioj@jcrosoft.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 9/9] defaultenv-2: create a specific defaultenv for splash To: Jean-Christophe PLAGNIOL-VILLARD Cc: barebox@lists.infradead.org On Tue, Dec 23, 2014 at 07:21:58PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > This will allow to factorize splash init > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > --- > common/Kconfig | 5 +++++ > defaultenv/Makefile | 1 + > defaultenv/defaultenv-2-splash/bin/splash | 15 +++++++++++++++ > defaultenv/defaultenv-2-splash/init/splash | 3 +++ > defaultenv/defaultenv.c | 2 ++ > 5 files changed, 26 insertions(+) > create mode 100644 defaultenv/defaultenv-2-splash/bin/splash > create mode 100644 defaultenv/defaultenv-2-splash/init/splash > > diff --git a/common/Kconfig b/common/Kconfig > index 05f76ae..3f1ef6f 100644 > --- a/common/Kconfig > +++ b/common/Kconfig > @@ -653,6 +653,11 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU > depends on USB_GADGET_DFU > default y > > +config DEFAULT_ENVIRONMENT_GENERIC_NEW_SPLASH > + bool > + depends on CMD_SPLASH > + default y > + > config DEFAULT_ENVIRONMENT_GENERIC > bool > depends on !HAVE_DEFAULT_ENVIRONMENT_NEW > diff --git a/defaultenv/Makefile b/defaultenv/Makefile > index fc679eb..03d241c 100644 > --- a/defaultenv/Makefile > +++ b/defaultenv/Makefile > @@ -1,6 +1,7 @@ > bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW) += defaultenv-2-base > bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU) += defaultenv-2-menu > bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU) += defaultenv-2-dfu > +bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_SPLASH) += defaultenv-2-splash > bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-1 > obj-$(CONFIG_DEFAULT_ENVIRONMENT) += defaultenv.o > extra-y += barebox_default_env barebox_default_env.h barebox_default_env$(DEFAULT_COMPRESSION_SUFFIX) > diff --git a/defaultenv/defaultenv-2-splash/bin/splash b/defaultenv/defaultenv-2-splash/bin/splash > new file mode 100644 > index 0000000..352439d > --- /dev/null > +++ b/defaultenv/defaultenv-2-splash/bin/splash > @@ -0,0 +1,15 @@ > +#!/bin/sh > + > +splash="/env/splash.png" > + > +if [ ! -f ${splash} ]; then > + return > +fi > + > +splash ${splash} > + > +if [ $? = 0 ]; then > + fb0.enable=1 > +else > + echo "Cannot show splash image" > +fi > diff --git a/defaultenv/defaultenv-2-splash/init/splash b/defaultenv/defaultenv-2-splash/init/splash > new file mode 100644 > index 0000000..04fdc8e > --- /dev/null > +++ b/defaultenv/defaultenv-2-splash/init/splash > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +/env/bin/splash Why do you need a separate /env/bin/splash here? Can't you add its content here directly? If we keep it, it should have the same name as the 'splash' command. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox