[U-Boot] [PATCH] lib_arm: do_bootm_linux() - correct a small mistake

[U-Boot] [PATCH] lib_arm: do_bootm_linux() - correct a small mistake

[Ilko Iliev]

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

[U-Boot] [PATCH] lib_arm: do_bootm_linux() - correct a small mistake

[Jean-Christophe PLAGNIOL-VILLARD]

On 15:53 Sun 09 Nov     , Ilko Iliev wrote:
> 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>
> ---
>  lib_arm/bootm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
Applied to u-boot-arm/master and u-boot-arm/omap3

Best Regards,
J.

[U-Boot] Merge fixes/clean up outside merge window? was: Re: [PATCH] lib_arm: do_bootm_linux() - correct a small mistake

[Dirk Behme]

Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 15:53 Sun 09 Nov     , Ilko Iliev wrote:
> 
>>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>
>>---
>> lib_arm/bootm.c |    2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> Applied to u-boot-arm/master and u-boot-arm/omap3

Is there any special reason why no git pull request for mainline for 
this is sent? Isn't this an important fix which should go into 
mainline even if merge window is not open?

Dirk

And btw: What's about merging clean up patches like

http://lists.denx.de/pipermail/u-boot/2008-November/043220.html

now (outside merge window) into mainline via e.g. u-boot-arm/master? 
Having this merged now, I could rebase OMAP3 patch against this and 
mainline would be ready when merge window opens.

[U-Boot] Merge fixes/clean up outside merge window? was: Re: [PATCH] lib_arm: do_bootm_linux() - correct a small mistake

[Wolfgang Denk]

Dear Dirk,

In message <492595B5.3050505@googlemail.com> you wrote:
>
> >>This patch corrects a small bug in the "if" condition: 
...
> > Applied to u-boot-arm/master and u-boot-arm/omap3
> 
> Is there any special reason why no git pull request for mainline for 
> this is sent? Isn't this an important fix which should go into 
> mainline even if merge window is not open?

Yes, this *should* go into mainline ASAP.

I am waiting for a pull request for u-boot-arm myself, too.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
How many QA engineers does it take to screw in a lightbulb? 3:  1  to
screw it in and 2 to say "I told you so" when it doesn't work.