enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ nand-sata-install cosmetics ] Suppress error on probing, bigger message for bootloader write, adding "eMMC". It works - at least where eMMC = SD card

Browse Source
This commit is contained in:
Igor Pecovnik 2019-01-08 18:06:22 +01:00
parent 5beb95d8f9
commit 34ccb5d625
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/bsp/common/usr/sbin/nand-sata-install
View File

@ -79,9 +79,9 @@ create_armbian()
sync && mkdir -p ${TempDir}/bootfs ${TempDir}/rootfs
if [[ $eMMCFilesystemChoosen =~ ^(btrfs|f2fs)$ ]]; then
[[ -n $1 ]] && mount ${1::-1}"1" ${TempDir}/bootfs
[[ -n $2 ]] && ( mount -o compress-force=zlib $2 ${TempDir}/rootfs || mount $2 ${TempDir}/rootfs )
[[ -n $2 ]] && ( mount -o compress-force=zlib $2 ${TempDir}/rootfs 2> /dev/null || mount $2 ${TempDir}/rootfs )
else
[[ -n $2 ]] && ( mount -o compress-force=zlib $2 ${TempDir}/rootfs || mount $2 ${TempDir}/rootfs )
[[ -n $2 ]] && ( mount -o compress-force=zlib $2 ${TempDir}/rootfs 2> /dev/null || mount $2 ${TempDir}/rootfs )
[[ -n $1 && $1 != "spi" ]] && mount $1 ${TempDir}/bootfs
fi
rm -rf ${TempDir}/bootfs/* ${TempDir}/rootfs/*
@ -582,7 +582,7 @@ main()
[[ -n $spicheck ]] && options+=(4 "Boot from SPI - system on SATA, USB or NVMe")
# U-boot install/update options
[[ -n ${root_partition_device} ]] && options+=(5 "Install/Update the bootloader on SD")
[[ -n ${root_partition_device} ]] && options+=(5 "Install/Update the bootloader on SD/eMMC")
[[ ( $LINUXFAMILY == odroidxu4 || $LINUXFAMILY == mvebu* || $LINUXFAMILY == mt7623 ) && ( -b /dev/mmcblk0boot0 || -b /dev/mmcblk1boot0 ) ]] && options+=(6 "Install/Update the bootloader on special eMMC partition")
[[ -n $spicheck && $(type -t write_uboot_platform_mtd) == function ]] && options+=(7 "Install/Update the bootloader on SPI Flash")
@ -644,9 +644,9 @@ main()
create_armbian "spi" "$DISK_ROOT_PART"
;;
5)
show_warning "This script will update the bootloader on SD. Continue?"
show_warning "This script will update the bootloader on SD/eMMC. Continue?"
write_uboot_platform $DIR ${root_partition_device}
echo "Done"
dialog --backtitle "$backtitle" --title "Writing bootloader" --msgbox "\n Done." 7 30
return
;;
6)