hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
wifipineapple-openwrt/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch

12 lines
350 B
Diff
Raw Normal View History

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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43389 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-26 09:00:17 +00:00
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43499 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-02 15:25:37 +00:00
@@ -77,7 +77,7 @@ static int do_bootm_subcommand(cmd_tbl_t
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43389 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-11-26 09:00:17 +00:00
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;
}