From 1cbe0d659c4438cc6348093385a24e969aeadac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 17 Jul 2019 11:32:54 +0200 Subject: treewide: sysupgrade: get rid of platform_nand_pre_upgrade() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1) nand_do_upgrade() is always called by a target code 2) nand_do_upgrade() starts with calling platform_nand_pre_upgrade() It means there is no need for the platform_nand_pre_upgrade() callback at all. All code that was present there could bo moved & simplly called by a target right before the nand_do_upgrade(). Signed-off-by: Rafał Miłecki --- target/linux/pistachio/base-files/lib/upgrade/platform.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'target/linux/pistachio') diff --git a/target/linux/pistachio/base-files/lib/upgrade/platform.sh b/target/linux/pistachio/base-files/lib/upgrade/platform.sh index 4de019a27c..174c321d38 100755 --- a/target/linux/pistachio/base-files/lib/upgrade/platform.sh +++ b/target/linux/pistachio/base-files/lib/upgrade/platform.sh @@ -26,10 +26,7 @@ platform_do_upgrade() { # stage2 directly but need to refactor nand_upgrade_success # for this to work. # Also the nand functions don't allow url to be used - nand_do_upgrade $1 -} -platform_nand_pre_upgrade() { local board=$(board_name) case "$board" in @@ -48,4 +45,6 @@ platform_nand_pre_upgrade() { echo "Upgrading partition $CI_UBIPART (/dev/mtd$(find_mtd_index $CI_UBIPART))" ;; esac + + nand_do_upgrade $1 } -- cgit v1.2.3