aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-12-02 15:25:37 +0000
committerJohn Crispin <john@openwrt.org>2014-12-02 15:25:37 +0000
commit283d7789eea8cb57e31bc6a06d47c5813ebba283 (patch)
tree619c254c97177f391a09333a8c9a25879a250b0f /package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch
parenta122c1c9c9e68be04ca39763a9638fc43fb96c99 (diff)
downloadupstream-283d7789eea8cb57e31bc6a06d47c5813ebba283.tar.gz
upstream-283d7789eea8cb57e31bc6a06d47c5813ebba283.tar.bz2
upstream-283d7789eea8cb57e31bc6a06d47c5813ebba283.zip
uboot-oxnas: bump to U-Boot 2014.10
A few trivial changes were needed to adapt to upstream framework changes. Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 43499
Diffstat (limited to 'package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch')
-rw-r--r--package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch b/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch
index 3abeb3215c..957c492917 100644
--- a/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch
+++ b/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch
@@ -1,8 +1,6 @@
-diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
-index 166b901..9af3fd3 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
-@@ -745,7 +745,7 @@ static int do_bootm_subcommand(cmd_tbl_t *cmdtp, int flag, int argc,
+@@ -77,7 +77,7 @@ static int do_bootm_subcommand(cmd_tbl_t
return CMD_RET_USAGE;
}