diff --git a/distributions/LibreELEC/splash/boot-logo.bmp.gz b/distributions/LibreELEC/splash/boot-logo.bmp.gz new file mode 100644 index 0000000000..18885867c5 Binary files /dev/null and b/distributions/LibreELEC/splash/boot-logo.bmp.gz differ 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")