From 367a30389d298948a3c4867dd0261bb942371147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 14 May 2020 18:19:35 +0200 Subject: bcm63xx: add support for Comtrend VR-3032u MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- .../bcm63xx/base-files/lib/upgrade/platform.sh | 60 +++++++++++++++++++++- 1 file changed, 58 insertions(+), 2 deletions(-) (limited to 'target/linux/bcm63xx/base-files/lib/upgrade') diff --git a/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh index 5c9e2c25f7..0debff28bb 100644 --- a/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh @@ -1,9 +1,19 @@ PART_NAME=linux +REQUIRE_IMAGE_METADATA=0 + platform_check_image() { [ "$#" -gt 1 ] && return 1 + + case "$(board_name)" in + comtrend,vr-3032u) + # NAND sysupgrade + return 0 + ;; + esac + case "$(get_magic_word "$1")" in 3600|3700|3800) - # 6348GW-11 boards use openwrt-96348GW-11-squashfs-cfe.bin files + # CFE tag versions return 0 ;; *) @@ -13,4 +23,50 @@ platform_check_image() { esac } -# use default for platform_do_upgrade() +cfe_jffs2_upgrade_tar() { + local tar_file="$1" + local kernel_mtd="$(find_mtd_index $CI_KERNPART)" + + if [ -z "$kernel_mtd" ]; then + echo "$CI_KERNPART partition not found" + return 1 + fi + + local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$') + board_dir=${board_dir%/} + + local kernel_length=$(tar xf $tar_file ${board_dir}/kernel -O | wc -c 2> /dev/null) + local rootfs_length=$(tar xf $tar_file ${board_dir}/root -O | wc -c 2> /dev/null) + + if [ "$kernel_length" = 0 ]; then + echo "kernel cannot be empty" + return 1 + fi + + flash_erase -j /dev/mtd${kernel_mtd} 0 0 + tar xf $tar_file ${board_dir}/kernel -O | nandwrite /dev/mtd${kernel_mtd} - + + local rootfs_type="$(identify_tar "$tar_file" ${board_dir}/root)" + + nand_upgrade_prepare_ubi "$rootfs_length" "$rootfs_type" "0" "0" + + local ubidev="$( nand_find_ubi "$CI_UBIPART" )" + + local root_ubivol="$(nand_find_volume $ubidev $CI_ROOTPART)" + tar xf $tar_file ${board_dir}/root -O | \ + ubiupdatevol /dev/$root_ubivol -s $rootfs_length - + + nand_do_upgrade_success +} + +platform_do_upgrade() { + case "$(board_name)" in + comtrend,vr-3032u) + REQUIRE_IMAGE_METADATA=1 + cfe_jffs2_upgrade_tar "$1" + ;; + *) + default_do_upgrade "$1" + ;; + esac +} -- cgit v1.2.3