From 1fa04b5d9fb1cba56a8597d6da9e1d52b8030f6b Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 18 Jan 2020 02:21:13 +0100 Subject: mvebu: split base-files across subtargets For the mvebu target in particular, there is a lot of files in base-files that are only relevant for one subtarget. Improve overview and reduce size per subtarget by moving/splitting base-files depending on the subtarget they belong to. While at it, consolidate 01_leds by using the model part of the board name as variable. Signed-off-by: Adrian Schmutzler Acked-by: Tomasz Maciej Nowak --- target/linux/mvebu/base-files/lib/upgrade/uDPU.sh | 156 ---------------------- 1 file changed, 156 deletions(-) delete mode 100644 target/linux/mvebu/base-files/lib/upgrade/uDPU.sh (limited to 'target/linux/mvebu/base-files/lib/upgrade/uDPU.sh') diff --git a/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh b/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh deleted file mode 100644 index 032c706605..0000000000 --- a/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh +++ /dev/null @@ -1,156 +0,0 @@ -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 -} - -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 -} - -udpu_do_part_check() { - local emmc_parts="1 2 3 4" - local part_valid="1" - - # Check if the block devices exist - for num in ${emmc_parts}; do - [[ ! -b ${emmc_dev}p${num} ]] && part_valid="0" - done - - # If partitions are missing create a new partition table - if [ "$part_valid" != "1" ]; then - printf "Invalid partition table, creating a new one\n" - printf "o\nn\np\n1\n\n+256M\nn\np\n2\n\n+256M\nn\np\n3\n\n+1536M\nn\np\n\n\nw\n" | fdisk -W always $emmc_dev > /dev/null 2>&1 - - # Format the /misc part right away as we will need it for the firmware - printf "Formating /misc partition, this make take a while..\n" - 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" - - udpu_do_initial_setup - else - printf "Partition table looks ok\n" - fi -} - -udpu_do_misc_prep() { - if [ ! "$(grep -wo /misc /proc/mounts)" ]; then - mkdir -p /misc - mount ${emmc_dev}p4 /misc - - # If the mount fails, try to reformat partition - # Leaving possiblity for multiple iterations - if [ $? -ne 0 ]; then - printf "Error while mounting /misc, trying to reformat..\n" - - format_count=0 - while [ "$format_count" -lt "1" ]; do - udpu_part_prep ${emmc_dev}p4 - mkfs.f2fs -q -l misc ${emmc_dev}p4 - mount ${emmc_dev}p4 /misc - if [ $? -ne 0 ]; then - umount -l /misc - printf "Failed while mounting /misc\n" - format_count=$((format_count +1)) - else - printf "Mounted /misc successfully\n" - break - fi - done - fi - fi -} - -udpu_do_initial_setup() { - # Prepare /recovery parition - udpu_part_prep ${emmc_dev}p2 - mkfs.ext4 -q ${emmc_dev}p2 | echo y &> /dev/null - - # Prepare /boot partition - 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" - udpu_part_prep ${emmc_dev}p3 - mkfs.f2fs -q -l rootfs ${emmc_dev}p3 - [ $? -eq 0 ] && printf "/root partition reformated\n" -} - -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 - mount ${emmc_dev}p1 /tmp/boot - rm -rf /tmp/boot/* - - # Clean /root partition - mkfs.f2fs is not available in chroot - [ "$(grep -wo /dev/root /proc/mounts)" ] && umount / - mkdir -p /tmp/rootpart - mount ${emmc_dev}p3 /tmp/rootpart - rm -rf /tmp/rootpart/* -} - -platform_do_upgrade_uDPU() { - udpu_check_emmc - - # Prepare and extract firmware on /misc partition - udpu_do_misc_prep - - [ -f "/misc/firmware" ] && rm -r /misc/firmware - mkdir -p /misc/firmware - tar xzf "$1" -C /misc/firmware/ - - udpu_do_regular_upgrade - - printf "Updating /boot partition\n" - tar xzf /misc/firmware/boot.tgz -C /tmp/boot - [ $? -eq 0 ] && printf "/boot partition updated successfully\n" || printf "/boot partition update failed\n" - sync - - printf "Updating /root partition\n" - tar xzf /misc/firmware/rootfs.tgz -C /tmp/rootpart - [ $? -eq 0 ] && printf "/root partition updated successfully\n" || printf "/root partition update failed\n" - sync - - # Saving configuration files over sysupgrade - platform_copy_config_uDPU - - # Remove tmp mounts - tmp_parts=$(grep "${emmc_dev}" /proc/mounts | awk '{print $2}') - for part in ${tmp_parts}; do - umount $part - # Force umount is necessary - [ "$(grep "${part}" /proc/mounts)" ] && umount -l $part - done - - # Sysupgrade complains about /tmp and /dev, so we can detach them here - umount -l /tmp - umount -l /dev -} - -platform_copy_config_uDPU() { - # Config is saved on the /misc partition and copied on the rootfs after the reboot - if [ -f "$UPGRADE_BACKUP" ]; then - cp -f "$UPGRADE_BACKUP" "/misc/$BACKUP_FILE" - sync - fi -} -- cgit v1.2.3