mediatek: BananaPi BPi-R3 bootloader update

[openwrt/staging/jow.git] / target / linux / mediatek / filogic / base-files / lib / upgrade / platform.sh

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 889a1e2bd1e7498a8e98c23e1982ee0e7ac1535e..6f539eba8e841977a7bc0c0d437307ad8e6c5fbf 100755 (executable)
--- 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*)