From 61137a88952e125c574aa35209fd581591d8796a Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 18 Jan 2024 22:15:35 +0000 Subject: mediatek: BananaPi BPi-R3 bootloader update * Switch to all-UBI layout on SPI-NAND * use fitblk driver instead of uImage.FIT partition parser * adapt sysupgrade * bump COMPAT_VERSION Remove BROKEN mark now that all needed changes are done. Boards running images generated before this commit will require full reflash of the bootloader, re-install from SD card is the easiest way to achieve that. Signed-off-by: Daniel Golle --- .../filogic/base-files/lib/upgrade/platform.sh | 27 +++++----------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'target/linux/mediatek/filogic/base-files/lib') 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 889a1e2bd1..6f539eba8e 100755 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh @@ -95,26 +95,7 @@ platform_do_upgrade() { CI_KERNPART="linux" nand_do_upgrade "$1" ;; - bananapi,bpi-r3) - local rootdev="$(cmdline_get_var root)" - rootdev="${rootdev##*/}" - rootdev="${rootdev%p[0-9]*}" - case "$rootdev" in - mmc*) - CI_ROOTDEV="$rootdev" - CI_KERNPART="production" - emmc_do_upgrade "$1" - ;; - mtdblock*) - PART_NAME="fit" - default_do_upgrade "$1" - ;; - ubiblock*) - CI_KERNPART="fit" - nand_do_upgrade "$1" - ;; - esac - ;; + bananapi,bpi-r3|\ bananapi,bpi-r4) [ -e /dev/fit0 ] && fitblk /dev/fit0 [ -e /dev/fitrw ] && fitblk /dev/fitrw @@ -124,6 +105,10 @@ platform_do_upgrade() { 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" @@ -225,7 +210,6 @@ platform_check_image() { platform_copy_config() { case "$(board_name)" in - bananapi,bpi-r3|\ cmcc,rax3000m) case "$(cmdline_get_var root)" in /dev/mmc*) @@ -233,6 +217,7 @@ platform_copy_config() { ;; esac ;; + bananapi,bpi-r3|\ bananapi,bpi-r4) case "$(platform_get_bootdev)" in mmcblk*) -- cgit v1.2.3