scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-29 17:42:41 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

treewide: Fix dual boot fw upgrade for Edgecore APs

Browse Source 
Fixes: WIFI-13497
Signed-off-by: Tanya Singh <tanya_singh@accton.com>
This commit is contained in:
Tanya Singh
2024-03-12 18:33:44 +08:00
committed by John Crispin
parent afcffbc418
commit 0412bf03eb
9 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
feeds/ipq40xx/ipq40xx/base-files/lib/upgrade/platform.sh
View File

@@ -83,12 +83,12 @@ platform_do_upgrade() {
part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | cut -d " " -f 1)" part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | cut -d " " -f 1)"
case "$part" in case "$part" in
rootfs1) rootfs1)
fw_setenv active 2 || exit 1
CI_UBIPART="rootfs2" CI_UBIPART="rootfs2"
CI_FWSETENV="active 2"
;; ;;
rootfs2) rootfs2)
fw_setenv active 1 || exit 1
CI_UBIPART="rootfs1" CI_UBIPART="rootfs1"
CI_FWSETENV="active 1"
;; ;;
*) *)
# legacy bootloader # legacy bootloader

2
feeds/ipq807x/ipq807x/base-files/lib/upgrade/nand.sh
View File

@@ -247,8 +247,8 @@ nand_do_upgrade_success() {
local conf_tar="/tmp/sysupgrade.tgz" local conf_tar="/tmp/sysupgrade.tgz"
sync sync
[ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig [ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar" && sync
[ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV [ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
echo "sysupgrade successful" echo "sysupgrade successful"
umount -a umount -a
reboot -f reboot -f

4
feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh
View File

@@ -260,8 +260,8 @@ platform_do_upgrade() {
else else
if [ -e /tmp/downgrade ]; then if [ -e /tmp/downgrade ]; then
CI_UBIPART="rootfs1" CI_UBIPART="rootfs1"
fw_setenv active 1 || exit 1 { echo 'active 1'; echo 'upgrade_available 0'; } > /tmp/fw_setenv.txt || exit 1
fw_setenv upgrade_available 0 || exit 1 CI_FWSETENV="-s /tmp/fw_setenv.txt"
elif grep -q rootfs1 /proc/cmdline; then elif grep -q rootfs1 /proc/cmdline; then
CI_UBIPART="rootfs2" CI_UBIPART="rootfs2"
CI_FWSETENV="active 2" CI_FWSETENV="active 2"

2
feeds/ipq807x_v5.4/ipq50xx/base-files/lib/upgrade/nand.sh
View File

@@ -247,8 +247,8 @@ nand_do_upgrade_success() {
local conf_tar="/tmp/sysupgrade.tgz" local conf_tar="/tmp/sysupgrade.tgz"
sync sync
[ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig [ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar" && sync
[ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV [ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
echo "sysupgrade successful" echo "sysupgrade successful"
umount -a umount -a
reboot -f reboot -f

2
feeds/ipq807x_v5.4/ipq60xx/base-files/lib/upgrade/nand.sh
View File

@@ -247,8 +247,8 @@ nand_do_upgrade_success() {
local conf_tar="/tmp/sysupgrade.tgz" local conf_tar="/tmp/sysupgrade.tgz"
sync sync
[ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig [ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar" && sync
[ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV [ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
echo "sysupgrade successful" echo "sysupgrade successful"
umount -a umount -a
reboot -f reboot -f

4
feeds/ipq807x_v5.4/ipq60xx/base-files/lib/upgrade/platform.sh
View File

@@ -122,10 +122,10 @@ platform_do_upgrade() {
else else
if grep -q rootfs1 /proc/cmdline; then if grep -q rootfs1 /proc/cmdline; then
CI_UBIPART="rootfs2" CI_UBIPART="rootfs2"
fw_setenv active 2 || exit 1 CI_FWSETENV="active 2"
else else
CI_UBIPART="rootfs1" CI_UBIPART="rootfs1"
fw_setenv active 1 || exit 1 CI_FWSETENV="active 1"
fi fi
fi fi
nand_upgrade_tar "$1" nand_upgrade_tar "$1"

2
feeds/ipq807x_v5.4/ipq807x/base-files/lib/upgrade/nand.sh
View File

@@ -247,8 +247,8 @@ nand_do_upgrade_success() {
local conf_tar="/tmp/sysupgrade.tgz" local conf_tar="/tmp/sysupgrade.tgz"
sync sync
[ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig [ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar" && sync
[ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV [ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
echo "sysupgrade successful" echo "sysupgrade successful"
umount -a umount -a
reboot -f reboot -f

10
feeds/ipq807x_v5.4/ipq807x/base-files/lib/upgrade/platform.sh
View File

@@ -61,12 +61,16 @@ platform_do_upgrade() {
if [ "$(find_mtd_chardev rootfs)" ]; then if [ "$(find_mtd_chardev rootfs)" ]; then
CI_UBIPART="rootfs" CI_UBIPART="rootfs"
else else
if grep -q rootfs1 /proc/cmdline; then if [ -e /tmp/downgrade ]; then
CI_UBIPART="rootfs1"
{ echo 'active 1'; echo 'upgrade_available 0'; } > /tmp/fw_setenv.txt || exit 1
CI_FWSETENV="-s /tmp/fw_setenv.txt"
elif grep -q rootfs1 /proc/cmdline; then
CI_UBIPART="rootfs2" CI_UBIPART="rootfs2"
fw_setenv active 2 || exit 1 CI_FWSETENV="active 2"
else else
CI_UBIPART="rootfs1" CI_UBIPART="rootfs1"
fw_setenv active 1 || exit 1 CI_FWSETENV="active 1"
fi fi
fi fi
nand_upgrade_tar "$1" nand_upgrade_tar "$1"

2
feeds/ipq95xx/ipq95xx/base-files/lib/upgrade/nand.sh
View File

@@ -247,8 +247,8 @@ nand_do_upgrade_success() {
local conf_tar="/tmp/sysupgrade.tgz" local conf_tar="/tmp/sysupgrade.tgz"
sync sync
[ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig [ "$CI_BOOTCFG" = 1 ] && nand_qca_update_bootconfig
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar" && sync
[ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV [ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV
[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
echo "sysupgrade successful" echo "sysupgrade successful"
umount -a umount -a
sleep 5 sleep 5