diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-12-13 18:05:42 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-12-13 18:05:42 +0000 |
commit | 242af0ed0ae99e672a7f9b38a7ee7711392c4081 (patch) | |
tree | 551839ea07b1b6dd7b0a780c0c72f07836d44e8d /target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh | |
parent | caa247cf354e3734eb0fa42950c0ad50d2bdaf42 (diff) | |
download | master-187ad058-242af0ed0ae99e672a7f9b38a7ee7711392c4081.tar.gz master-187ad058-242af0ed0ae99e672a7f9b38a7ee7711392c4081.tar.bz2 master-187ad058-242af0ed0ae99e672a7f9b38a7ee7711392c4081.zip |
ar71xx: Update merakinand.sh to fix sysupgrade
Remove reliance on /lib/upgrade/nand.sh as this is called by sysupgrade,
based on felix's comments at
https://lists.openwrt.org/pipermail/openwrt-devel/2015-December/037963.html
Signed-off-by: Chris R Blake <chrisrblake93@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47889 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh')
-rw-r--r-- | target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh b/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh index fe78e9ff96..cc7a86c93d 100644 --- a/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh @@ -7,7 +7,6 @@ # . /lib/ar71xx.sh . /lib/functions.sh -. /lib/upgrade/nand.sh get_magic_at() { local mtddev=$1 |