From: Ilko Iliev <iliev@ronetix.at>
Date: Sun, 9 Nov 2008 14:53:14 +0000 (+0100)
Subject: lib_arm: do_bootm_linux() - correct a small mistake
X-Git-Tag: v2009.01-rc1~62^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=263b749e2e25473a48776d317bd2a7e2ddcdd212;p=karo-tx-uboot.git

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>
---

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;