Merge pull request #2502 from kszaq/le90_aml_cleanup_4

projects/Amlogic: update.sh fix and cleanup
This commit is contained in:
Radostan Riedel 2018-02-18 13:14:33 +01:00 committed by GitHub
commit f24c0f2602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -35,10 +35,12 @@ if [ -z "$BOOT_DISK" ]; then
esac esac
fi fi
mount -o rw,remount $BOOT_ROOT
for arg in $(cat /proc/cmdline); do for arg in $(cat /proc/cmdline); do
case $arg in case $arg in
boot=*) boot=*)
echo "*** updating BOOT partition label ..." echo "Updating BOOT partition label..."
boot="${arg#*=}" boot="${arg#*=}"
case $boot in case $boot in
/dev/mmc*) /dev/mmc*)
@ -62,30 +64,30 @@ for arg in $(cat /proc/cmdline); do
fi fi
if [ -f "$UPDATE_DTB_SOURCE" ] ; then if [ -f "$UPDATE_DTB_SOURCE" ] ; then
echo "*** updating device tree from $UPDATE_DTB_SOURCE ..." echo "Updating device tree from $UPDATE_DTB_SOURCE..."
case $boot in case $boot in
/dev/system) /dev/system)
dd if=/dev/zero of=/dev/dtb bs=256k count=1 status=none dd if=/dev/zero of=/dev/dtb bs=256k count=1 status=none
dd if="$UPDATE_DTB_SOURCE" of=/dev/dtb bs=256k status=none dd if="$UPDATE_DTB_SOURCE" of=/dev/dtb bs=256k status=none
;; ;;
/dev/mmc*|LABEL=*) /dev/mmc*|LABEL=*)
mount -o rw,remount $BOOT_ROOT
cp -f "$UPDATE_DTB_SOURCE" "$BOOT_ROOT/dtb.img" cp -f "$UPDATE_DTB_SOURCE" "$BOOT_ROOT/dtb.img"
;; ;;
esac esac
fi fi
for all_dtb in /flash/*.dtb /flash/DTB; do for all_dtb in /flash/*.dtb ; do
dtb=$(basename $all_dtb) if [ -f $all_dtb ] ; then
if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then dtb=$(basename $all_dtb)
echo "*** updating Device Tree Blob: $dtb ..." if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
mount -o rw,remount $BOOT_ROOT echo "Updating $dtb..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT
fi
fi fi
done done
;; ;;
disk=*) disk=*)
echo "*** updating DISK partition label ..." echo "Updating DISK partition label..."
disk="${arg#*=}" disk="${arg#*=}"
case $disk in case $disk in
/dev/mmc*) /dev/mmc*)
@ -100,31 +102,30 @@ for arg in $(cat /proc/cmdline); do
done done
if [ -d $BOOT_ROOT/device_trees ]; then if [ -d $BOOT_ROOT/device_trees ]; then
mount -o rw,remount $BOOT_ROOT
rm $BOOT_ROOT/device_trees/*.dtb rm $BOOT_ROOT/device_trees/*.dtb
cp -p $SYSTEM_ROOT/usr/share/bootloader/*.dtb $BOOT_ROOT/device_trees/ cp -p $SYSTEM_ROOT/usr/share/bootloader/*.dtb $BOOT_ROOT/device_trees/
fi fi
if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot.ini ]; then if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot.ini ]; then
echo "*** updating boot.ini ..." echo "Updating boot.ini..."
mount -o rw,remount $BOOT_ROOT
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot.ini $BOOT_ROOT/boot.ini cp -p $SYSTEM_ROOT/usr/share/bootloader/boot.ini $BOOT_ROOT/boot.ini
if [ -f $SYSTEM_ROOT/usr/share/bootloader/config.ini ]; then if [ -f $SYSTEM_ROOT/usr/share/bootloader/config.ini ]; then
if [ ! -f $BOOT_ROOT/config.ini ]; then if [ ! -f $BOOT_ROOT/config.ini ]; then
echo "*** creating config.ini ..." echo "Creating config.ini..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/config.ini $BOOT_ROOT/config.ini cp -p $SYSTEM_ROOT/usr/share/bootloader/config.ini $BOOT_ROOT/config.ini
fi fi
fi fi
fi fi
if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot-logo.bmp.gz ]; then if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot-logo.bmp.gz ]; then
echo "*** updating boot logo ..." echo "Updating boot logo..."
mount -o rw,remount $BOOT_ROOT
cp -p $SYSTEM_ROOT/usr/share/bootloader/boot-logo.bmp.gz $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/boot-logo.bmp.gz $BOOT_ROOT
fi fi
if [ -f $SYSTEM_ROOT/usr/share/bootloader/u-boot -a ! -e /dev/system -a ! -e /dev/boot ]; then if [ -f $SYSTEM_ROOT/usr/share/bootloader/u-boot -a ! -e /dev/system -a ! -e /dev/boot ]; then
echo "*** updating u-boot on: $BOOT_DISK ..." echo "Updating u-boot on: $BOOT_DISK..."
dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=1 count=112 status=none dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=1 count=112 status=none
dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=512 skip=1 seek=1 status=none dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=512 skip=1 seek=1 status=none
fi fi
mount -o ro,remount $BOOT_ROOT