[openwrt/openwrt] mediatek: make use of common uImage.FIT upgrade functions
LEDE Commits
lede-commits at lists.infradead.org
Thu Jul 18 03:49:35 PDT 2024
dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/4448d6325fcd9393c1019dca07d5a75ea74eccf5
commit 4448d6325fcd9393c1019dca07d5a75ea74eccf5
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Wed Jul 17 16:24:03 2024 +0100
mediatek: make use of common uImage.FIT upgrade functions
Use newly introduced fit_do_upgrade() function in /lib/upgrade/platform.sh.
Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
.../filogic/base-files/lib/upgrade/platform.sh | 35 +++++-----------------
.../mt7622/base-files/lib/upgrade/platform.sh | 19 +-----------
2 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
index 2fed8a0ab5..eb11a3b551 100755
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -88,24 +88,13 @@ platform_do_upgrade() {
bananapi,bpi-r4-poe|\
jdcloud,re-cp-03|\
mediatek,mt7988a-rfb|\
- openwrt,one)
- [ -e /dev/fit0 ] && fitblk /dev/fit0
- [ -e /dev/fitrw ] && fitblk /dev/fitrw
- bootdev="$(fitblk_get_bootdev)"
- case "$bootdev" in
- mmcblk*)
- EMMC_KERN_DEV="/dev/$bootdev"
- emmc_do_upgrade "$1"
- ;;
- mtdblock*)
- PART_NAME="/dev/mtd${bootdev:8}"
- default_do_upgrade "$1"
- ;;
- ubiblock*)
- CI_KERNPART="fit"
- nand_do_upgrade "$1"
- ;;
- esac
+ nokia,ea0326gmp|\
+ openwrt,one|\
+ tplink,tl-xdr4288|\
+ tplink,tl-xdr6086|\
+ tplink,tl-xdr6088|\
+ xiaomi,redmi-router-ax6000-ubootmod)
+ fit_do_upgrade "$1"
;;
cmcc,rax3000m)
case "$(cmdline_get_var root)" in
@@ -147,16 +136,6 @@ platform_do_upgrade() {
CI_UBIPART="ubi0"
nand_do_upgrade "$1"
;;
- nokia,ea0326gmp|\
- tplink,tl-xdr4288|\
- tplink,tl-xdr6086|\
- tplink,tl-xdr6088|\
- xiaomi,redmi-router-ax6000-ubootmod)
- [ -e /dev/fit0 ] && fitblk /dev/fit0
- [ -e /dev/fitrw ] && fitblk /dev/fitrw
- CI_KERNPART="fit"
- nand_do_upgrade "$1"
- ;;
ubnt,unifi-6-plus)
CI_KERNPART="kernel0"
EMMC_ROOT_DEV="$(cmdline_get_var root)"
diff --git a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
index 59375ccd9b..a9a39f8e83 100755
--- a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
@@ -12,25 +12,8 @@ platform_do_upgrade() {
ubnt,unifi-6-lr-v2-ubootmod|\
ubnt,unifi-6-lr-v3-ubootmod|\
xiaomi,redmi-router-ax6s)
- [ -e /dev/fit0 ] && fitblk /dev/fit0
- [ -e /dev/fitrw ] && fitblk /dev/fitrw
- bootdev="$(fitblk_get_bootdev)"
- case "$bootdev" in
- mmcblk*)
- EMMC_KERN_DEV="/dev/$bootdev"
- emmc_do_upgrade "$1"
- ;;
- mtdblock*)
- PART_NAME="/dev/mtd${bootdev:8}"
- default_do_upgrade "$1"
- ;;
- ubiblock*)
- CI_KERNPART="fit"
- nand_do_upgrade "$1"
- ;;
- esac
+ fit_do_upgrade "$1"
;;
-
buffalo,wsr-2533dhp2|\
buffalo,wsr-3200ax4s)
local magic="$(get_magic_long "$1")"
More information about the lede-commits
mailing list