[PATCH 9/9] defaultenv-2: create a specific defaultenv for splash

[Sascha Hauer]

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 <plagnioj at jcrosoft.com>
> ---
>  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 |