diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 3b6262e152..4b32836c7a 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -129,8 +129,7 @@ makeinstall_target() { case $PROJECT in Odroid_C2) cp -PRv $PKG_DIR/scripts/update-c2.sh $INSTALL/usr/share/bootloader/update.sh - cp -PRv $ROOT/$PKG_BUILD/sd_fuse/bl1.bin.hardkernel $INSTALL/usr/share/bootloader/bl1 - cp -PRv $ROOT/$PKG_BUILD/sd_fuse/u-boot.bin $INSTALL/usr/share/bootloader/u-boot + cp -PRv $ROOT/$PKG_BUILD/u-boot.bin $INSTALL/usr/share/bootloader/u-boot ;; 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 876cac8c68..afca03aa2a 100755 --- a/packages/tools/u-boot/release +++ b/packages/tools/u-boot/release @@ -41,8 +41,7 @@ mkdir -p $RELEASE_DIR/3rdparty/bootloader case $PROJECT in Odroid_C2) - cp -PR $BUILD/$BOOTLOADER-*/sd_fuse/bl1.bin.hardkernel $RELEASE_DIR/3rdparty/bootloader/bl1 - cp -PR $BUILD/$BOOTLOADER-*/sd_fuse/u-boot.bin $RELEASE_DIR/3rdparty/bootloader/u-boot + 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 ;; esac diff --git a/packages/tools/u-boot/scripts/update-c2.sh b/packages/tools/u-boot/scripts/update-c2.sh index 8902e5d1db..dd0f269b54 100644 --- a/packages/tools/u-boot/scripts/update-c2.sh +++ b/packages/tools/u-boot/scripts/update-c2.sh @@ -46,9 +46,8 @@ fi echo "*** updating u-boot for Odroid on: $BOOT_DISK ..." -dd if=$SYSTEM_ROOT/usr/share/bootloader/bl1 of=$BOOT_DISK conv=fsync bs=1 count=442 -dd if=$SYSTEM_ROOT/usr/share/bootloader/bl1 of=$BOOT_DISK conv=fsync bs=512 seek=1 skip=1 -dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=512 seek=97 +dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=1 count=112 +dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=512 skip=1 seek=1 # monkey patch boot.ini for updated kernel sed -i '/setenv bootcmd "${kernel}; ${dtb}; ${bootseq}"/i \setenv timer "fdt addr 0x1000000; fdt rm /timer"' /flash/boot.ini diff --git a/scripts/mkimage b/scripts/mkimage index 11c089cf20..e2ba15dc0d 100755 --- a/scripts/mkimage +++ b/scripts/mkimage @@ -230,9 +230,8 @@ elif [ "$BOOTLOADER" = "u-boot" ]; then # allow custom dd script for vendor specific fusing . $RELEASE_DIR/3rdparty/bootloader/u-boot-fuse elif [ -f "$RELEASE_DIR/3rdparty/bootloader/u-boot" ]; then - dd if="$RELEASE_DIR/3rdparty/bootloader/bl1" of="$DISK" conv=fsync,notrunc bs=1 count=442 >"$SAVE_ERROR" 2>&1 || show_error - dd if="$RELEASE_DIR/3rdparty/bootloader/bl1" of="$DISK" conv=fsync,notrunc bs=512 skip=1 seek=1 >"$SAVE_ERROR" 2>&1 || show_error - dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot" of="$DISK" conv=fsync,notrunc bs=512 seek=97 >"$SAVE_ERROR" 2>&1 || show_error + dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot" of="$DISK" conv=fsync,notrunc bs=1 count=112 >"$SAVE_ERROR" 2>&1 || show_error + dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot" of="$DISK" conv=fsync,notrunc bs=512 skip=1 seek=1 >"$SAVE_ERROR" 2>&1 || show_error fi echo "image: copying files to part1..."