diff options
| author | John Crispin <john@openwrt.org> | 2014-11-26 09:00:17 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-11-26 09:00:17 +0000 |
| commit | c05048b0bb686bfa927d3a4848127b9052549fb1 (patch) | |
| tree | 2c546927f7bdac026bfeda08e9856d5eef738b66 /package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch | |
| parent | 72b58f2eb12ad4aa0c59481d0911dc5e39180eb5 (diff) | |
| download | upstream-c05048b0bb686bfa927d3a4848127b9052549fb1.tar.gz upstream-c05048b0bb686bfa927d3a4848127b9052549fb1.tar.bz2 upstream-c05048b0bb686bfa927d3a4848127b9052549fb1.zip | |
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
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.patch | 13 |
1 files changed, 13 insertions, 0 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 new file mode 100644 index 0000000000..3abeb3215c --- /dev/null +++ b/package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch @@ -0,0 +1,13 @@ +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; + } |