<div dir="ltr">Merged. Thanks for you contribution and sorry for being late. <br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, May 22, 2013 at 11:39 AM, Paul Barker <span dir="ltr"><<a href="mailto:paul@paulbarker.me.uk" target="_blank">paul@paulbarker.me.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Instead of overriding the default psplash image, the raspberrypi image is added<br>
as an additional image. It is then set as the default in the raspberrypi machine<br>
config file so that other targets do not pick up our splash image.<br>
<br>
Tested on raspberrpi and qemuarm: on raspberrypi I see to Raspberry Pi logo, on<br>
qemuarm I see the Yocto Project logo.<br>
<br>
Signed-off-by: Paul Barker <<a href="mailto:paul@paulbarker.me.uk">paul@paulbarker.me.uk</a>><br>
---<br>
conf/machine/raspberrypi.conf | 3 +++<br>
recipes-core/psplash/psplash_git.bbappend | 2 +-<br>
2 files changed, 4 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf<br>
index 6e95291..e25b59a 100644<br>
--- a/conf/machine/raspberrypi.conf<br>
+++ b/conf/machine/raspberrypi.conf<br>
@@ -32,3 +32,6 @@ MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"<br>
MACHINE_EXTRA_RRECOMMENDS += " \<br>
kernel-modules \<br>
"<br>
+<br>
+# Set raspberrypi splash image<br>
+SPLASH = "psplash-raspberrypi"<br>
diff --git a/recipes-core/psplash/psplash_git.bbappend b/recipes-core/psplash/psplash_git.bbappend<br>
index eea8dfb..65dc30f 100644<br>
--- a/recipes-core/psplash/psplash_git.bbappend<br>
+++ b/recipes-core/psplash/psplash_git.bbappend<br>
@@ -1,2 +1,2 @@<br>
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"<br>
-SPLASH_IMAGES = "file://psplash-raspberrypi-img.h;outsuffix=default"<br>
+SPLASH_IMAGES += "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi"<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.2.2<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr"><div style="text-align:center"></div><div style="text-align:center"><div align="left" style="font-family:'Times New Roman';font-size:medium">
<b style="color:rgb(51,51,51);font-family:Arial;font-size:small;text-align:center">Andrei Gherzan</b><font face="Arial" color="#333333" size="-1"><br></font><font face="Arial" color="#333333" size="-1">m: +40.744.478.414 | f: +40.31.816.28.12</font><br>
</div></div></div>
</div>