RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-28 01:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

bmips: switch to standard nand_do_upgrade

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

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2023-06-15 10:48:25 +02:00
parent 434df8df54
commit 464dfac049
4 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
target/linux/bmips/base-files/lib/upgrade/cfe-jffs2-nand.sh
View File

@ -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
}

5
target/linux/bmips/bcm63268/base-files/lib/upgrade/platform.sh
View File

@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
. /lib/upgrade/cfe-jffs2-nand.sh
PART_NAME=firmware PART_NAME=firmware
REQUIRE_IMAGE_METADATA=1 REQUIRE_IMAGE_METADATA=1
@ -12,7 +10,8 @@ platform_check_image() {
platform_do_upgrade() { platform_do_upgrade() {
case "$(board_name)" in case "$(board_name)" in
comtrend,vr-3032u) comtrend,vr-3032u)
cfe_jffs2_nand_upgrade "$1" CI_JFFS2_CLEAN_MARKERS=1
nand_do_upgrade "$1"
;; ;;
sercomm,h500-s-lowi |\ sercomm,h500-s-lowi |\
sercomm,h500-s-vfes |\ sercomm,h500-s-vfes |\

2
target/linux/bmips/bcm6328/base-files/lib/upgrade/platform.sh
View File

@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
. /lib/upgrade/cfe-jffs2-nand.sh
PART_NAME=firmware PART_NAME=firmware
REQUIRE_IMAGE_METADATA=1 REQUIRE_IMAGE_METADATA=1

5
target/linux/bmips/bcm6362/base-files/lib/upgrade/platform.sh
View File

@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
. /lib/upgrade/cfe-jffs2-nand.sh
PART_NAME=firmware PART_NAME=firmware
REQUIRE_IMAGE_METADATA=1 REQUIRE_IMAGE_METADATA=1
@ -13,7 +11,8 @@ platform_do_upgrade() {
case "$(board_name)" in case "$(board_name)" in
huawei,hg253s-v2 |\ huawei,hg253s-v2 |\
netgear,dgnd3700-v2) netgear,dgnd3700-v2)
cfe_jffs2_nand_upgrade "$1" CI_JFFS2_CLEAN_MARKERS=1
nand_do_upgrade "$1"
;; ;;
*) *)
default_do_upgrade "$1" default_do_upgrade "$1"