From eab44ec7ea042a4d1adf5e2bf76736fb4df69063 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 25 Feb 2024 21:12:10 +0000 Subject: mediatek: drop platform_get_bootdev Now that we got fitblk_get_bootdev in /lib/upgrade/common.sh we don't need platform_get_bootdev in each of the subtargets any longer. Signed-off-by: Daniel Golle --- .../filogic/base-files/lib/upgrade/platform.sh | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'target/linux/mediatek/filogic') 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 a28f44fde1..e0c64ab85f 100755 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh @@ -60,21 +60,6 @@ xiaomi_initial_setup() esac } -platform_get_bootdev() { - local rootdisk="$(cat /sys/firmware/devicetree/base/chosen/rootdisk)" - local handle bootdev - for handle in /sys/class/block/*/of_node/phandle /sys/class/block/*/device/of_node/phandle; do - [ ! -e "$handle" ] && continue - if [ "$rootdisk" = "$(cat $handle)" ]; then - bootdev="${handle%/of_node/phandle}" - bootdev="${bootdev%/device}" - bootdev="${bootdev#/sys/class/block/}" - echo "$bootdev" - break - fi - done -} - platform_do_upgrade() { local board=$(board_name) @@ -100,7 +85,7 @@ platform_do_upgrade() { bananapi,bpi-r4) [ -e /dev/fit0 ] && fitblk /dev/fit0 [ -e /dev/fitrw ] && fitblk /dev/fitrw - bootdev="$(platform_get_bootdev)" + bootdev="$(fitblk_get_bootdev)" case "$bootdev" in mmcblk*) EMMC_KERN_DEV="/dev/$bootdev" @@ -221,7 +206,7 @@ platform_copy_config() { bananapi,bpi-r3|\ bananapi,bpi-r3-mini|\ bananapi,bpi-r4) - case "$(platform_get_bootdev)" in + case "$(fitblk_get_bootdev)" in mmcblk*) emmc_copy_config ;; -- cgit v1.2.3