aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bmips
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bmips')
-rw-r--r--target/linux/bmips/base-files/lib/upgrade/cfe-jffs2-nand.sh37
-rw-r--r--target/linux/bmips/bcm63268/base-files/lib/upgrade/platform.sh5
-rw-r--r--target/linux/bmips/bcm6328/base-files/lib/upgrade/platform.sh2
-rw-r--r--target/linux/bmips/bcm6362/base-files/lib/upgrade/platform.sh5
4 files changed, 4 insertions, 45 deletions
diff --git a/target/linux/bmips/base-files/lib/upgrade/cfe-jffs2-nand.sh b/target/linux/bmips/base-files/lib/upgrade/cfe-jffs2-nand.sh
deleted file mode 100644
index 64b8df652b..0000000000
--- a/target/linux/bmips/base-files/lib/upgrade/cfe-jffs2-nand.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-cfe_jffs2_nand_upgrade() {
- 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
-}
diff --git a/target/linux/bmips/bcm63268/base-files/lib/upgrade/platform.sh b/target/linux/bmips/bcm63268/base-files/lib/upgrade/platform.sh
index 0aaf10442b..befffd346e 100644
--- a/target/linux/bmips/bcm63268/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bmips/bcm63268/base-files/lib/upgrade/platform.sh
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-. /lib/upgrade/cfe-jffs2-nand.sh
-
PART_NAME=firmware
REQUIRE_IMAGE_METADATA=1
@@ -12,7 +10,8 @@ platform_check_image() {
platform_do_upgrade() {
case "$(board_name)" in
comtrend,vr-3032u)
- cfe_jffs2_nand_upgrade "$1"
+ CI_JFFS2_CLEAN_MARKERS=1
+ nand_do_upgrade "$1"
;;
sercomm,h500-s-lowi |\
sercomm,h500-s-vfes |\
diff --git a/target/linux/bmips/bcm6328/base-files/lib/upgrade/platform.sh b/target/linux/bmips/bcm6328/base-files/lib/upgrade/platform.sh
index eb1d7fd0e5..1cf95be26a 100644
--- a/target/linux/bmips/bcm6328/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bmips/bcm6328/base-files/lib/upgrade/platform.sh
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-. /lib/upgrade/cfe-jffs2-nand.sh
-
PART_NAME=firmware
REQUIRE_IMAGE_METADATA=1
diff --git a/target/linux/bmips/bcm6362/base-files/lib/upgrade/platform.sh b/target/linux/bmips/bcm6362/base-files/lib/upgrade/platform.sh
index 9175cf4255..ded966e4cc 100644
--- a/target/linux/bmips/bcm6362/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bmips/bcm6362/base-files/lib/upgrade/platform.sh
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-. /lib/upgrade/cfe-jffs2-nand.sh
-
PART_NAME=firmware
REQUIRE_IMAGE_METADATA=1
@@ -13,7 +11,8 @@ platform_do_upgrade() {
case "$(board_name)" in
huawei,hg253s-v2 |\
netgear,dgnd3700-v2)
- cfe_jffs2_nand_upgrade "$1"
+ CI_JFFS2_CLEAN_MARKERS=1
+ nand_do_upgrade "$1"
;;
*)
default_do_upgrade "$1"