bcm63xx: switch to standard nand_do_upgrade

Now that JFFS2 cleanmarkers are supported on the standard nand_do_upgrade
function we can start using it on bcm63xx.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh
index 0d836729ee6d0e65fb1afbbdee4a69fd1cbb515b..620e0ab4f42b95bfd49df843549e81064c411f5b 100644 (file)
--- a/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh
@@ -29,42 +29,6 @@ platform_check_image() {
        esac
 }
 
-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,vg-8050|\
@@ -72,7 +36,8 @@ platform_do_upgrade() {
                huawei,hg253s-v2|\
                netgear,dgnd3700-v2)
                        REQUIRE_IMAGE_METADATA=1
-                       cfe_jffs2_upgrade_tar "$1"
+                       CI_JFFS2_CLEAN_MARKERS=1
+                       nand_do_upgrade "$1"
                        ;;
                sercomm,ad1018|\
                sercomm,h500-s-lowi|\