openwrtv4/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch
John Crispin c05048b0bb add uboot-oxnas
This adds support for the oxnas target in U-Boot 2014.04
History can be found at https://github.com/kref/u-boot-oxnas up to 2013.10
changes from 2013.10 to 2014.04 can be followed at
https://gitorious.org/openwrt-oxnas

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43389
2014-11-26 09:00:17 +00:00

13 lines
463 B
Diff

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,
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;
}