diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 5e2cae6b5b..cb3655dbd2 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -82,10 +82,6 @@ makeinstall_target() { mkdir -p $INSTALL/usr/share/bootloader - if [ -f "./u-boot.bin" ]; then - cp ./u-boot.bin $INSTALL/usr/share/bootloader - fi - if [ -f "./u-boot.imx" ]; then cp ./u-boot.imx $INSTALL/usr/share/bootloader fi @@ -94,23 +90,17 @@ makeinstall_target() { cp ./u-boot.img $INSTALL/usr/share/bootloader fi - if [ -f "./MLO" ]; then - cp ./MLO $INSTALL/usr/share/bootloader - fi - if [ -f "./SPL" ]; then cp ./SPL $INSTALL/usr/share/bootloader fi - if [ -f "./boot.cfg" ]; then - cp ./boot.cfg $INSTALL/usr/share/bootloader - fi - if [ -f "./$UBOOT_CONFIGFILE" ]; then cp ./$UBOOT_CONFIGFILE $INSTALL/usr/share/bootloader fi - for config in $PROJECT_DIR/$PROJECT/bootloader/*; do - cp -PR $config $INSTALL/usr/share/bootloader - done + cp -PRv $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader + + if [ -f "$PROJECT_DIR/$PROJECT/bootloader/uEnv.txt" ]; then + cp -PR $PROJECT_DIR/$PROJECT/bootloader/uEnv.txt $INSTALL/usr/share/bootloader + fi } diff --git a/packages/tools/u-boot/release b/packages/tools/u-boot/release index f0de17090b..ac355a1674 100755 --- a/packages/tools/u-boot/release +++ b/packages/tools/u-boot/release @@ -25,14 +25,22 @@ if [ -z "$UBOOT_CONFIGFILE" ]; then fi mkdir -p $RELEASE_DIR/3rdparty/bootloader - cp -PR $BUILD/u-boot-*/$UBOOT_CONFIGFILE $RELEASE_DIR/3rdparty/bootloader - cp -PR $BUILD/u-boot-*/SPL $RELEASE_DIR/3rdparty/bootloader + if [ -e $BUILD/u-boot-*/$UBOOT_CONFIGFILE ] ;then + cp -PR $BUILD/u-boot-*/$UBOOT_CONFIGFILE $RELEASE_DIR/3rdparty/bootloader + fi + + if [ -e $BUILD/u-boot-*/SPL ] ;then + cp -PR $BUILD/u-boot-*/SPL $RELEASE_DIR/3rdparty/bootloader + elif [ -e $BUILD/u-boot-*/u-boot.imx ] ;then + cp -PR $BUILD/u-boot-*/u-boot.imx $RELEASE_DIR/3rdparty/bootloader + fi + cp -PR $BUILD/u-boot-*/u-boot.img $RELEASE_DIR/3rdparty/bootloader for dtb in $BUILD/linux-*/arch/arm/boot/dts/*.dtb; do cp -PR $dtb $RELEASE_DIR/3rdparty/bootloader done - for config in $PROJECT_DIR/$PROJECT/bootloader/*; do - cp -PR $config $RELEASE_DIR/3rdparty/bootloader - done + if [ -f "$PROJECT_DIR/$PROJECT/bootloader/uEnv.txt" ]; then + cp -PR $PROJECT_DIR/$PROJECT/bootloader/uEnv.txt $RELEASE_DIR/3rdparty/bootloader + fi