mediatek: filogic: don't rely on image preset in flash or sysupgrade

Instead of trying to figure out the actual root device, just use the
kernel 'root' cmdline parameter as a hint to decide which device to
flash to.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2022-10-18 19:47:25 +01:00
parent 2c6b212a2f
commit de94587e70
No known key found for this signature in database
GPG Key ID: 5A8F39C31C3217CA

View File

@ -2,23 +2,20 @@ REQUIRE_IMAGE_METADATA=1
platform_do_upgrade() {
local board=$(board_name)
local file_type=$(identify $1)
case "$board" in
bananapi,bpi-r3)
export_bootdevice
export_partdevice rootdev 0
case "$rootdev" in
mmc*)
case "$(cmdline_get_var root)" in
/dev/mmc*)
CI_ROOTDEV="$rootdev"
CI_KERNPART="production"
emmc_do_upgrade "$1"
;;
mtdblock*)
/dev/mtdblock*)
PART_NAME="fit"
default_do_upgrade "$1"
;;
ubiblock*)
/dev/ubiblock*)
CI_KERNPART="fit"
nand_do_upgrade "$1"
;;
@ -58,10 +55,8 @@ platform_check_image() {
platform_copy_config() {
case "$(board_name)" in
bananapi,bpi-r3)
export_bootdevice
export_partdevice rootdev 0
case "$rootdev" in
mmc*)
case "$(cmdline_get_var root)" in
/dev/mmc*)
emmc_copy_config
;;
esac