From 188328111b46ebc9592ee0f5cbcd2439d1c4aef0 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Mon, 18 Dec 2017 20:32:18 +0100 Subject: treewide: move nand_do_upgrade call to platform_do_upgrade Calling nand_do_upgrade() from platform_pre_upgrade() was deprecated with 30f61a34b4cf ("base-files: always use staged sysupgrade"). Update the platform upgrade code to use platform_do_upgrade() for NAND images as well. Signed-off-by: Mathias Kresin --- target/linux/rb532/base-files/lib/upgrade/platform.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'target/linux/rb532/base-files') diff --git a/target/linux/rb532/base-files/lib/upgrade/platform.sh b/target/linux/rb532/base-files/lib/upgrade/platform.sh index 2beccc5985..a6a6e9b8d3 100644 --- a/target/linux/rb532/base-files/lib/upgrade/platform.sh +++ b/target/linux/rb532/base-files/lib/upgrade/platform.sh @@ -10,15 +10,11 @@ platform_check_image() { return 0; } -platform_pre_upgrade() { - nand_do_upgrade "$1" -} - platform_nand_pre_upgrade() { mtd erase kernel tar xf "$1" "sysupgrade-$(board_name)/kernel" -O | nandwrite -o /dev/mtd0 - } platform_do_upgrade() { - default_do_upgrade "$ARGV" + nand_do_upgrade "$1" } -- cgit v1.2.3