projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
arch
/
nios2
/
lib
/
bootm.c
diff --git
a/arch/nios2/lib/bootm.c
b/arch/nios2/lib/bootm.c
index
114e146
..
51597ea
100644
(file)
--- a/
arch/nios2/lib/bootm.c
+++ b/
arch/nios2/lib/bootm.c
@@
-45,6
+45,12
@@
int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
if (of_flat_tree)
initrd_end = (ulong)of_flat_tree;
+ /*
+ * allow the PREP bootm subcommand, it is required for bootm to work
+ */
+ if (flag & BOOTM_STATE_OS_PREP)
+ return 0;
+
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
return 1;