[][openwrt-24][common][bsp][Fix fit related patches]
[Description]
Fix fit related patches to follow changes from upstream
[Release-log]
N/A
Change-Id: I7f237eb8c0bda849dfface9ad79b93dd1b07dfc7
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9402384
diff --git a/master/patches-base/0100-filogic-01-add-support-for-MediaTek-RFBs.patch b/master/patches-base/0100-filogic-01-add-support-for-MediaTek-RFBs.patch
index 7386fcb..f3a9404 100644
--- a/master/patches-base/0100-filogic-01-add-support-for-MediaTek-RFBs.patch
+++ b/master/patches-base/0100-filogic-01-add-support-for-MediaTek-RFBs.patch
@@ -42,11 +42,11 @@
+mediatek,mt7986a-rfb|\
+mediatek,mt7986b-rfb|\
+mediatek,mt7988a-rfb)
-+ . /lib/upgrade/common.sh
++ . /lib/upgrade/fit.sh
+
-+ bootdev="$(fitblk_get_bootdev)"
-+ case "$bootdev" in
-+ ubi*)
++ export_fitblk_bootdev
++ case "$CI_METHOD" in
++ ubi)
+ local env_ubi_vol=$(cat /sys/firmware/devicetree/base/mediatek,env-ubi-volume 2>/dev/null)
+ local env_ubi_vol2=$(cat /sys/firmware/devicetree/base/mediatek,env-ubi-volume-redund 2>/dev/null)
+ local env_size=$(cat /sys/firmware/devicetree/base/mediatek,env-size 2>/dev/null)
@@ -69,7 +69,7 @@
+ ubootenv_add_uci_config "$envdev2" "0x0" "${env_size}" "${env_size}" "1"
+ fi
+ ;;
-+ mmc*)
++ emmc)
+ local env_part=$(cat /sys/firmware/devicetree/base/mediatek,env-part 2>/dev/null)
+ local env_size=$(cat /sys/firmware/devicetree/base/mediatek,env-size 2>/dev/null)
+ local env_off=$(cat /sys/firmware/devicetree/base/mediatek,env-offset 2>/dev/null)
@@ -84,7 +84,7 @@
+ ubootenv_add_uci_config "${env_dev}" "${env_redund_off}" "${env_size}" "${env_size}" "1"
+ fi
+ ;;
-+ mtd*)
++ default)
+ local env_part=$(cat /sys/firmware/devicetree/base/mediatek,env-part 2>/dev/null)
+ local env_size=$(cat /sys/firmware/devicetree/base/mediatek,env-size 2>/dev/null)
+ local env_redund_off=$(cat /sys/firmware/devicetree/base/mediatek,env-redund-offset 2>/dev/null)
@@ -100,6 +100,6 @@
+ ;;
+ esac
+ ;;
- asus,rt-ax59u)
- ubootenv_add_uci_config "/dev/mtd0" "0x100000" "0x20000" "0x20000"
- ;;
+ abt,asr3000|\
+ h3c,magic-nx30-pro|\
+ jcg,q30-pro|\
diff --git a/master/patches-base/0100-filogic-02-add-support-for-MediaTek-RBFs-upgrade.patch b/master/patches-base/0100-filogic-02-add-support-for-MediaTek-RBFs-upgrade.patch
index e738b2b..56b5e7b 100644
--- a/master/patches-base/0100-filogic-02-add-support-for-MediaTek-RBFs-upgrade.patch
+++ b/master/patches-base/0100-filogic-02-add-support-for-MediaTek-RBFs-upgrade.patch
@@ -14,7 +14,7 @@
asus_initial_setup()
{
-@@ -64,6 +64,31 @@ platform_do_upgrade() {
+@@ -64,6 +64,29 @@ platform_do_upgrade() {
local board=$(board_name)
case "$board" in
@@ -22,17 +22,15 @@
+ mediatek,mt7988a-rfb)
+ [ -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"
++ export_fitblk_bootdev
++ case "$CI_METHOD" in
++ emmc)
+ mmc_do_upgrade "$1"
+ ;;
-+ mtdblock*)
-+ PART_NAME="/dev/mtd${bootdev:8}"
++ default)
+ default_do_upgrade "$1"
+ ;;
-+ ubiblock*)
++ ubi)
+ CI_KERNPART="firmware"
+ ubi_do_upgrade "$1"
+ ;;
@@ -43,38 +41,24 @@
+ ;;
+ esac
+ ;;
- acer,predator-w6|\
- smartrg,sdg-8612|\
- smartrg,sdg-8614|\
-@@ -134,7 +159,6 @@ platform_do_upgrade() {
- ;;
- h3c,magic-nx30-pro|\
- jcg,q30-pro|\
-- mediatek,mt7981-rfb|\
- netcore,n60|\
- qihoo,360t7|\
- xiaomi,mi-router-ax3000t-ubootmod|\
-@@ -205,6 +229,8 @@ platform_check_image() {
+ abt,asr3000|\
+ bananapi,bpi-r3|\
+ bananapi,bpi-r3-mini|\
+@@ -175,6 +198,8 @@ platform_check_image() {
[ "$#" -gt 1 ] && return 1
case "$board" in
+ mediatek,mt7981-rfb|\
+ mediatek,mt7988a-rfb|\
bananapi,bpi-r3|\
+ bananapi,bpi-r3-mini|\
bananapi,bpi-r4|\
- bananapi,bpi-r4-poe|\
-@@ -226,6 +252,14 @@ platform_check_image() {
+@@ -197,6 +222,8 @@ platform_check_image() {
platform_copy_config() {
case "$(board_name)" in
+ mediatek,mt7981-rfb|\
-+ mediatek,mt7988a-rfb)
-+ case "$(fitblk_get_bootdev)" in
-+ mmcblk*)
-+ mmc_copy_config
-+ ;;
-+ esac
-+ ;;
- cmcc,rax3000m)
- case "$(cmdline_get_var root)" in
- /dev/mmc*)
++ mediatek,mt7988a-rfb|\
+ bananapi,bpi-r3|\
+ bananapi,bpi-r3-mini|\
+ bananapi,bpi-r4|\