summaryrefslogtreecommitdiffstats
path: root/lib_arm
diff options
context:
space:
mode:
authorIlko Iliev <iliev@ronetix.at>2008-11-09 15:53:14 +0100
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-11-21 01:44:35 +0100
commit263b749e2e25473a48776d317bd2a7e2ddcdd212 (patch)
treeddad6281bf3d3e9d7d194fb555fddee69c3fe40b /lib_arm
parent9b827cf1720acda2473afa516956eab6f7cca9a1 (diff)
downloadtalos-obmc-uboot-263b749e2e25473a48776d317bd2a7e2ddcdd212.tar.gz
talos-obmc-uboot-263b749e2e25473a48776d317bd2a7e2ddcdd212.zip
lib_arm: do_bootm_linux() - correct a small mistake
This patch corrects a small bug in the "if" condition: the parameter "flag" is 0 and the "if" condition is always true. The result is - the boom command doesn't start the kernel. Affected targets: all arm based. Signed-off-by: Ilko Iliev <iliev@ronetix.at>
Diffstat (limited to 'lib_arm')
-rw-r--r--lib_arm/bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 8e264ceb2f..7dbde7df5c 100644
--- 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;
OpenPOWER on IntegriCloud