summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2015-02-24 07:04:38 +0100
committerTom Rini <trini@konsulko.com>2015-03-05 20:50:28 -0500
commitff6c032ea89ff1fdd97bfcaeadbc45726008a5ff (patch)
tree398a9b7bca18257d66848dd9aabe9d37a472cf4b /common
parent14f264e6fdce3cccae4e3816252b7a8bb3c7dd9f (diff)
downloadu-boot-imx-ff6c032ea89ff1fdd97bfcaeadbc45726008a5ff.zip
u-boot-imx-ff6c032ea89ff1fdd97bfcaeadbc45726008a5ff.tar.gz
u-boot-imx-ff6c032ea89ff1fdd97bfcaeadbc45726008a5ff.tar.bz2
spl: fix calling "spl export .." more than once
running "spl export ..." more than once fails with: Trying to execute a command out of order Trying to execute a command out of order Trying to execute a command out of order Trying to execute a command out of order Trying to execute a command out of order Trying to execute a command out of order ERROR prep subcommand failed! Subcommand failed reason is commmit: 35fc84fa1f: Refactor the bootm command to reduce code duplication It used "state != BOOTM_STATE_START" but state is a bitfield, so check if the bit BOOTM_STATE_START is not set. With this fix, "spl export ..." can called more than once ... Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 48199bf..4f77f22 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -78,7 +78,8 @@ 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) != BOOTM_STATE_START) &&
+ images.state >= state) {
printf("Trying to execute a command out of order\n");
return CMD_RET_USAGE;
}