domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm53xx: sysupgrade: call nand_do_upgrade() from platform_do_upgrade()

Browse Source 
Calling nand_do_upgrade() from platform_pre_upgrade() was obsoleted in
the commit 30f61a34b4 ("base-files: always use staged sysupgrade").

This change brings bcm53xx in sync with other targets and allows
dropping backward compatibility code. It shouldn't change any user
visible behavior.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit ccf8a8e863)
This commit is contained in:
Rafał Miłecki
2019-07-02 16:10:56 +02:00
committed by Jo-Philipp Wich
parent ebef2c27eb
commit e98eab1b6b
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
View File

@@ -1,4 +1,4 @@
RAMFS_COPY_BIN='osafeloader oseama' RAMFS_COPY_BIN='osafeloader oseama otrx'
PART_NAME=firmware PART_NAME=firmware
@@ -147,7 +147,7 @@ platform_check_image() {
# $(1): image for upgrade (with possible extra header) # $(1): image for upgrade (with possible extra header)
# $(2): offset of trx in image # $(2): offset of trx in image
platform_pre_upgrade_trx() { platform_do_upgrade_nand_trx() {
local dir="/tmp/sysupgrade-bcm53xx" local dir="/tmp/sysupgrade-bcm53xx"
local trx="$1" local trx="$1"
local offset="$2" local offset="$2"
@@ -210,7 +210,7 @@ platform_pre_upgrade_trx() {
nand_do_upgrade /tmp/root.ubi nand_do_upgrade /tmp/root.ubi
} }
platform_pre_upgrade_seama() { platform_do_upgrade_nand_seama() {
local dir="/tmp/sysupgrade-bcm53xx" local dir="/tmp/sysupgrade-bcm53xx"
local seama="$1" local seama="$1"
local tmp local tmp
@@ -257,20 +257,6 @@ platform_pre_upgrade_seama() {
nand_do_upgrade $dir/root.ubi nand_do_upgrade $dir/root.ubi
} }
platform_pre_upgrade() {
local file_type=$(platform_identify "$1")
[ "$(platform_flash_type)" != "nand" ] && return
# Find trx offset
case "$file_type" in
"chk") platform_pre_upgrade_trx "$1" $((0x$(get_magic_long_at "$1" 4)));;
"cybertan") platform_pre_upgrade_trx "$1" 32;;
"seama") platform_pre_upgrade_seama "$1";;
"trx") platform_pre_upgrade_trx "$1";;
esac
}
platform_trx_from_chk_cmd() { platform_trx_from_chk_cmd() {
local header_len=$((0x$(get_magic_long_at "$1" 4))) local header_len=$((0x$(get_magic_long_at "$1" 4)))
@@ -321,6 +307,15 @@ platform_do_upgrade() {
local cmd= local cmd=
[ "$(platform_flash_type)" == "nand" ] && { [ "$(platform_flash_type)" == "nand" ] && {
case "$file_type" in
"chk") platform_do_upgrade_nand_trx "$1" $((0x$(get_magic_long_at "$1" 4)));;
"cybertan") platform_do_upgrade_nand_trx "$1" 32;;
"seama") platform_do_upgrade_nand_seama "$1";;
"trx") platform_do_upgrade_nand_trx "$1";;
esac
# Above calls exit on success.
# If we got here something went wrong.
echo "Writing whole image to NAND flash. All erase counters will be lost." echo "Writing whole image to NAND flash. All erase counters will be lost."
} }