From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001
From: James <>
Date: Wed, 4 Nov 2015 11:49:21 +0000
Subject: trunk-47381

---
 .../boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch    | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch

(limited to 'package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch')

diff --git a/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch b/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch
new file mode 100644
index 0000000..957c492
--- /dev/null
+++ b/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch
@@ -0,0 +1,11 @@
+--- a/common/cmd_bootm.c
++++ b/common/cmd_bootm.c
+@@ -77,7 +77,7 @@ static int do_bootm_subcommand(cmd_tbl_t
+ 		return CMD_RET_USAGE;
+ 	}
+ 
+-	if (state != BOOTM_STATE_START && images.state >= state) {
++	if (!(state & BOOTM_STATE_START) && images.state >= state) {
+ 		printf("Trying to execute a command out of order\n");
+ 		return CMD_RET_USAGE;
+ 	}
-- 
cgit v1.2.3