Merged. Thanks for you contribution and sorry for being late.
On Wed, May 22, 2013 at 11:39 AM, Paul Barker <[email protected]> wrote: > Instead of overriding the default psplash image, the raspberrypi image is > added > as an additional image. It is then set as the default in the raspberrypi > machine > config file so that other targets do not pick up our splash image. > > Tested on raspberrpi and qemuarm: on raspberrypi I see to Raspberry Pi > logo, on > qemuarm I see the Yocto Project logo. > > Signed-off-by: Paul Barker <[email protected]> > --- > conf/machine/raspberrypi.conf | 3 +++ > recipes-core/psplash/psplash_git.bbappend | 2 +- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf > index 6e95291..e25b59a 100644 > --- a/conf/machine/raspberrypi.conf > +++ b/conf/machine/raspberrypi.conf > @@ -32,3 +32,6 @@ MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" > MACHINE_EXTRA_RRECOMMENDS += " \ > kernel-modules \ > " > + > +# Set raspberrypi splash image > +SPLASH = "psplash-raspberrypi" > diff --git a/recipes-core/psplash/psplash_git.bbappend > b/recipes-core/psplash/psplash_git.bbappend > index eea8dfb..65dc30f 100644 > --- a/recipes-core/psplash/psplash_git.bbappend > +++ b/recipes-core/psplash/psplash_git.bbappend > @@ -1,2 +1,2 @@ > FILESEXTRAPATHS_prepend := "${THISDIR}/files:" > -SPLASH_IMAGES = "file://psplash-raspberrypi-img.h;outsuffix=default" > +SPLASH_IMAGES += "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" > -- > 1.8.2.2 > > -- *Andrei Gherzan* m: +40.744.478.414 | f: +40.31.816.28.12
_______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
