From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 9/9] defaultenv-2: create a specific defaultenv for splash
Date: Tue, 23 Dec 2014 19:21:58 +0100 [thread overview]
Message-ID: <1419358918-25569-9-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1419358918-25569-1-git-send-email-plagnioj@jcrosoft.com>
This will allow to factorize splash init
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@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
diff --git a/defaultenv/defaultenv.c b/defaultenv/defaultenv.c
index 3b4efcf..712502d 100644
--- a/defaultenv/defaultenv.c
+++ b/defaultenv/defaultenv.c
@@ -48,6 +48,8 @@ static void defaultenv_add_base(void)
defaultenv_append_directory(defaultenv_2_menu);
if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU))
defaultenv_append_directory(defaultenv_2_dfu);
+ if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_SPLASH))
+ defaultenv_append_directory(defaultenv_2_splash);
if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC))
defaultenv_append_directory(defaultenv_1);
}
--
2.1.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-12-23 18:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-23 17:07 [PATCH 0/9] versatilepb, console, graphichs serie Jean-Christophe PLAGNIOL-VILLARD
2014-12-23 18:21 ` [PATCH 1/9] kfifo: allow to pass a null point on kfifo_free Jean-Christophe PLAGNIOL-VILLARD
2014-12-23 18:21 ` [PATCH 2/9] efika-mx-smartbook: enable led hearbeat on mail Jean-Christophe PLAGNIOL-VILLARD
2015-01-05 10:36 ` Sascha Hauer
2014-12-23 18:21 ` [PATCH 3/9] grapric_utils: set_pixel only write 16bit in 16bit mode Jean-Christophe PLAGNIOL-VILLARD
2015-01-05 10:37 ` Sascha Hauer
2014-12-23 18:21 ` [PATCH 4/9] versatilepb: move barebox to 32 MiB and use zImage Jean-Christophe PLAGNIOL-VILLARD
2015-01-05 10:38 ` Sascha Hauer
2014-12-23 18:21 ` [PATCH 5/9] versatilepb: switch to defaultenv-2 Jean-Christophe PLAGNIOL-VILLARD
2015-01-05 10:38 ` Sascha Hauer
2014-12-23 18:21 ` [PATCH 6/9] console: factorize kfifo input support Jean-Christophe PLAGNIOL-VILLARD
2015-01-05 11:18 ` Sascha Hauer
2014-12-23 18:21 ` [PATCH 7/9] poller: allow to restrict the poller frequency Jean-Christophe PLAGNIOL-VILLARD
2015-01-05 10:42 ` Sascha Hauer
2015-01-06 0:46 ` Jean-Christophe PLAGNIOL-VILLARD
2014-12-23 18:21 ` [PATCH 8/9] console: allow to specify the device id Jean-Christophe PLAGNIOL-VILLARD
2015-01-05 10:46 ` Sascha Hauer
2014-12-23 18:21 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2015-01-05 10:50 ` [PATCH 9/9] defaultenv-2: create a specific defaultenv for splash Sascha Hauer
2015-01-06 0:43 ` Jean-Christophe PLAGNIOL-VILLARD
2015-01-06 12:57 ` Sascha Hauer
2015-01-07 5:49 ` Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1419358918-25569-9-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox