From: Peter Pearse Date: Mon, 10 Nov 2008 11:17:47 +0000 Subject: [U-Boot] [PATCH] [ARM] Change flag check in lib_arm/bootm.c::do_bootm_linux() to allow booting. In-Reply-To: <> References: <> Message-ID: <1226315867-6672-1-git-send-email-peter.pearse@arm.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de (flag != 0) || (flag != BOOTM_STATE_OS_GO) allows nothing past. Signed-off-by: Peter Pearse --- lib_arm/bootm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c index 8e264ce..7dbde7d 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; -- 1.5.4.3