Skip to content

Commit

Permalink
mvebu: sysupgrade: fix uDPU eMMC check regression
Browse files Browse the repository at this point in the history
Add udpu_ prefix in all other function names

Signed-off-by: Vladimir Vid <vladimir.vid@sartura.hr>
  • Loading branch information
Vladimir Vid authored and lperkov committed Aug 29, 2019
1 parent 055abe9 commit bec2df9
Showing 1 changed file with 27 additions and 23 deletions.
50 changes: 27 additions & 23 deletions target/linux/mvebu/base-files/lib/upgrade/uDPU.sh
@@ -1,29 +1,31 @@
udpu_check_emmc() {
# uDPU uses combined ext4 and f2fs partitions.
# partition layout:
# 1. boot (ext4)
# 2. recovery (ext4)
# 3. rootfs (f2fs)
# 4. misc (f2fs)

# Check which device is available, depending on the board revision
if [ -b "/dev/mmcblk1" ]; then
emmc_dev=/dev/mmcblk1
elif [ -b "/dev/mmcblk0" ]; then
emmc_dev=/dev/mmcblk0
else
echo "Cannot detect eMMC flash, aborting.."
exit 1
fi

part_prep() {
# Check which device is available, depending on the board revision
if [ -b "/dev/mmcblk1" ]; then
emmc_dev=/dev/mmcblk1
elif [ -b "/dev/mmcblk0" ]; then
emmc_dev=/dev/mmcblk0
else
echo "Cannot detect eMMC flash, aborting.."
exit 1
fi
}

udpu_part_prep() {
if [ "$(grep $1 /proc/mounts)" ]; then
mounted_part="$(grep $1 /proc/mounts | awk '{print $2}' | head -1)"
umount $mounted_part
[ "$(grep -wo $mounted_part /proc/mounts)" ] && umount -l $mounted_part
fi
}

do_part_check() {
udpu_do_part_check() {
local emmc_parts="1 2 3 4"
local part_valid="1"

Expand All @@ -39,17 +41,17 @@ do_part_check() {

# Format the /misc part right away as we will need it for the firmware
printf "Formating /misc partition, this make take a while..\n"
part_prep ${emmc_dev}p4
udpu_part_prep ${emmc_dev}p4
mkfs.f2fs -q -l misc ${emmc_dev}p4
[ $? -eq 0 ] && printf "/misc partition formated successfully\n" || printf "/misc partition formatting failed\n"

do_initial_setup
udpu_do_initial_setup
else
printf "Partition table looks ok\n"
fi
}

do_misc_prep() {
udpu_do_misc_prep() {
if [ ! "$(grep -wo /misc /proc/mounts)" ]; then
mkdir -p /misc
mount ${emmc_dev}p4 /misc
Expand All @@ -61,7 +63,7 @@ do_misc_prep() {

format_count=0
while [ "$format_count" -lt "1" ]; do
part_prep ${emmc_dev}p4
udpu_part_prep ${emmc_dev}p4
mkfs.f2fs -q -l misc ${emmc_dev}p4
mount ${emmc_dev}p4 /misc
if [ $? -ne 0 ]; then
Expand All @@ -77,23 +79,23 @@ do_misc_prep() {
fi
}

do_initial_setup() {
udpu_do_initial_setup() {
# Prepare /recovery parition
part_prep ${emmc_dev}p2
udpu_part_prep ${emmc_dev}p2
mkfs.ext4 -q ${emmc_dev}p2 | echo y &> /dev/null

# Prepare /boot partition
part_prep ${emmc_dev}p1
udpu_part_prep ${emmc_dev}p1
mkfs.ext4 -q ${emmc_dev}p1 | echo y &> /dev/null

# Prepare /root partition
printf "Formating /root partition, this may take a while..\n"
part_prep ${emmc_dev}p3
udpu_part_prep ${emmc_dev}p3
mkfs.f2fs -q -l rootfs ${emmc_dev}p3
[ $? -eq 0 ] && printf "/root partition reformated\n"
}

do_regular_upgrade() {
udpu_do_regular_upgrade() {
# Clean /boot partition - mfks.ext4 is not available in chroot
[ "$(grep -wo /boot /proc/mounts)" ] && umount /boot
mkdir -p /tmp/boot
Expand All @@ -108,14 +110,16 @@ do_regular_upgrade() {
}

platform_do_upgrade_uDPU() {
udpu_check_emmc

# Prepare and extract firmware on /misc partition
do_misc_prep
udpu_do_misc_prep

[ -f "/misc/firmware" ] && rm -r /misc/firmware
mkdir -p /misc/firmware
tar xzf "$1" -C /misc/firmware/

do_regular_upgrade
udpu_do_regular_upgrade

printf "Updating /boot partition\n"
tar xzf /misc/firmware/boot.tgz -C /tmp/boot
Expand Down

0 comments on commit bec2df9

Please sign in to comment.