From 9dde35d4588de18556514ea27949d64c4b1774af Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 24 Aug 2016 23:03:18 +0200 Subject: [PATCH] scripts/mkimage: add support for boot-logo.bmp.gz --- distributions/LibreELEC/splash/boot-logo.bmp.gz | Bin 0 -> 10303 bytes packages/tools/u-boot/package.mk | 5 +++++ packages/tools/u-boot/release | 5 +++++ packages/tools/u-boot/scripts/update-c2.sh | 5 +++++ scripts/mkimage | 4 ++++ 5 files changed, 19 insertions(+) create mode 100644 distributions/LibreELEC/splash/boot-logo.bmp.gz diff --git a/distributions/LibreELEC/splash/boot-logo.bmp.gz b/distributions/LibreELEC/splash/boot-logo.bmp.gz new file mode 100644 index 0000000000000000000000000000000000000000..18885867c527a9786382b2bd10f05e381285ad4d GIT binary patch literal 10303 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%0ABSqFYj_YtqGsIFv5F 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 literal 0 HcmV?d00001 diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 4b32836c7a..02353d5366 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -130,6 +130,11 @@ makeinstall_target() { Odroid_C2) cp -PRv $PKG_DIR/scripts/update-c2.sh $INSTALL/usr/share/bootloader/update.sh cp -PRv $ROOT/$PKG_BUILD/u-boot.bin $INSTALL/usr/share/bootloader/u-boot + if [ -f $PROJECT_DIR/$PROJECT/splash/boot-logo.bmp.gz ]; then + cp -PRv $PROJECT_DIR/$PROJECT/splash/boot-logo.bmp.gz $INSTALL/usr/share/bootloader + elif [ -f $DISTRO_DIR/$DISTRO/splash/boot-logo.bmp.gz ]; then + cp -PRv $DISTRO_DIR/$DISTRO/splash/boot-logo.bmp.gz $INSTALL/usr/share/bootloader + fi ;; imx6) cp -PRv $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader diff --git a/packages/tools/u-boot/release b/packages/tools/u-boot/release index afca03aa2a..d15f665e4a 100755 --- a/packages/tools/u-boot/release +++ b/packages/tools/u-boot/release @@ -43,5 +43,10 @@ mkdir -p $RELEASE_DIR/3rdparty/bootloader Odroid_C2) cp -PR $BUILD/$BOOTLOADER-*/u-boot.bin $RELEASE_DIR/3rdparty/bootloader/u-boot cp -PR $PROJECT_DIR/$PROJECT/bootloader/boot.ini $RELEASE_DIR/3rdparty/bootloader + if [ -f $PROJECT_DIR/$PROJECT/splash/boot-logo.bmp.gz ]; then + cp -PR $PROJECT_DIR/$PROJECT/splash/boot-logo.bmp.gz $RELEASE_DIR/3rdparty/bootloader + elif [ -f $DISTRO_DIR/$DISTRO/splash/boot-logo.bmp.gz ]; then + cp -PR $DISTRO_DIR/$DISTRO/splash/boot-logo.bmp.gz $RELEASE_DIR/3rdparty/bootloader + fi ;; esac diff --git a/packages/tools/u-boot/scripts/update-c2.sh b/packages/tools/u-boot/scripts/update-c2.sh index dd0f269b54..7dde62898c 100644 --- a/packages/tools/u-boot/scripts/update-c2.sh +++ b/packages/tools/u-boot/scripts/update-c2.sh @@ -44,6 +44,11 @@ fi fi done +if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot-logo.bmp.gz ]; then + echo "*** updating boot logo ..." + cp -p $SYSTEM_ROOT/usr/share/bootloader/boot-logo.bmp.gz $BOOT_ROOT +fi + echo "*** updating u-boot for Odroid on: $BOOT_DISK ..." dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=1 count=112 diff --git a/scripts/mkimage b/scripts/mkimage index e2ba15dc0d..b631fa295c 100755 --- a/scripts/mkimage +++ b/scripts/mkimage @@ -246,6 +246,10 @@ elif [ "$BOOTLOADER" = "u-boot" ]; then mcopy $RELEASE_DIR/3rdparty/bootloader/u-boot.img :: fi + if [ -f $RELEASE_DIR/3rdparty/bootloader/boot-logo.bmp.gz ]; then + mcopy $RELEASE_DIR/3rdparty/bootloader/boot-logo.bmp.gz :: + fi + for dtb in $RELEASE_DIR/3rdparty/bootloader/*.dtb ; do if [ -f $dtb ] ; then mcopy "$dtb" ::/$(basename "$dtb")