projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
85xx: Use common LSDMR defines from asm/fsl_lbc.h
[oweals/u-boot.git]
/
lib_arm
/
bootm.c
diff --git
a/lib_arm/bootm.c
b/lib_arm/bootm.c
index 8e264ceb2fc52d688b3cd6f198d3ee30f1948578..7dbde7df5cebef36dc349d4d3189d111bd940cf6 100644
(file)
--- a/
lib_arm/bootm.c
+++ b/
lib_arm/bootm.c
@@
-67,7
+67,7
@@
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
char *commandline = getenv ("bootargs");
#endif
- if ((flag != 0)
||
(flag != BOOTM_STATE_OS_GO))
+ if ((flag != 0)
&&
(flag != BOOTM_STATE_OS_GO))
return 1;
theKernel = (void (*)(int, int, uint))images->ep;