Patchwork [U-Boot] avr32: fix do_bootm_linux

login
register
mail settings
Submitter Andreas Bießmann
Date July 2, 2013, 11:57 a.m.
Message ID <1372766264-15691-1-git-send-email-andreas.devel@googlemail.com>
Download mbox | patch
Permalink /patch/256393/
State Superseded
Delegated to: Tom Rini
Headers show

Comments

Andreas Bießmann - July 2, 2013, 11:57 a.m.
Commit 35fc84fa1ff51e15ecd3e464dac87eb105ffed30 broke bootm on avr32. It
requires to call do_bootm_linux() with flag set to BOOTM_STATE_OS_PREP before
calling it again with flag set to BOOTM_STATE_OS_GO.
Fix this by allowing flag set to BOOTM_STATE_OS_PREP, this however will
require a complete refactoring later on.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>

---
 arch/avr32/lib/bootm.c |    9 +++++++++
 1 file changed, 9 insertions(+)
Tom Rini - July 2, 2013, 1:03 p.m.
On Tue, Jul 02, 2013 at 01:57:44PM +0200, Andreas Bie??mann wrote:

> Commit 35fc84fa1ff51e15ecd3e464dac87eb105ffed30 broke bootm on avr32. It
> requires to call do_bootm_linux() with flag set to BOOTM_STATE_OS_PREP before
> calling it again with flag set to BOOTM_STATE_OS_GO.
> Fix this by allowing flag set to BOOTM_STATE_OS_PREP, this however will
> require a complete refactoring later on.
> 
> Signed-off-by: Andreas Bie??mann <andreas.devel@googlemail.com>
> 
> ---
>  arch/avr32/lib/bootm.c |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/avr32/lib/bootm.c b/arch/avr32/lib/bootm.c
> index 87f3f9c..eedab9d 100644
> --- a/arch/avr32/lib/bootm.c
> +++ b/arch/avr32/lib/bootm.c
> @@ -187,6 +187,15 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
>  	struct	tag *params, *params_start;
>  	char	*commandline = getenv("bootargs");
>  
> +	/*
> +	 * allow the PREP bootm subcommand, it is required for bootm to work
> +	 *
> +	 * TODO: Andreas Bie??mann <andreas.devel@googlemail.com> refactor the
> +	 * do_bootm_linux() for avr32
> +	 */
> +	if (flag & BOOTM_STATE_OS_PREP)
> +		return 0;
> +
>  	if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
>  		return 1;

Good catch!  I'm going to make a v2 of this patch that fixes all of the
other arches that're missing this hunk.
Andreas Bießmann - July 2, 2013, 2:06 p.m.
On 07/02/2013 03:03 PM, Tom Rini wrote:
> On Tue, Jul 02, 2013 at 01:57:44PM +0200, Andreas Bießmann wrote:
> 
>> Commit 35fc84fa1ff51e15ecd3e464dac87eb105ffed30 broke bootm on avr32. It
>> requires to call do_bootm_linux() with flag set to BOOTM_STATE_OS_PREP before
>> calling it again with flag set to BOOTM_STATE_OS_GO.
>> Fix this by allowing flag set to BOOTM_STATE_OS_PREP, this however will
>> require a complete refactoring later on.
>>
>> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
>>
>> ---
>>  arch/avr32/lib/bootm.c |    9 +++++++++
>>  1 file changed, 9 insertions(+)
>>
>> diff --git a/arch/avr32/lib/bootm.c b/arch/avr32/lib/bootm.c
>> index 87f3f9c..eedab9d 100644
>> --- a/arch/avr32/lib/bootm.c
>> +++ b/arch/avr32/lib/bootm.c
>> @@ -187,6 +187,15 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
>>  	struct	tag *params, *params_start;
>>  	char	*commandline = getenv("bootargs");
>>  
>> +	/*
>> +	 * allow the PREP bootm subcommand, it is required for bootm to work
>> +	 *
>> +	 * TODO: Andreas Bie??mann <andreas.devel@googlemail.com> refactor the
>> +	 * do_bootm_linux() for avr32
>> +	 */
>> +	if (flag & BOOTM_STATE_OS_PREP)
>> +		return 0;
>> +
>>  	if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
>>  		return 1;
> 
> Good catch!  I'm going to make a v2 of this patch that fixes all of the
> other arches that're missing this hunk.

Ok, thank you Tom

Regards,

Andreas Bießmann

Patch

diff --git a/arch/avr32/lib/bootm.c b/arch/avr32/lib/bootm.c
index 87f3f9c..eedab9d 100644
--- a/arch/avr32/lib/bootm.c
+++ b/arch/avr32/lib/bootm.c
@@ -187,6 +187,15 @@  int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
 	struct	tag *params, *params_start;
 	char	*commandline = getenv("bootargs");
 
+	/*
+	 * allow the PREP bootm subcommand, it is required for bootm to work
+	 *
+	 * TODO: Andreas Bießmann <andreas.devel@googlemail.com> refactor the
+	 * do_bootm_linux() for avr32
+	 */
+	if (flag & BOOTM_STATE_OS_PREP)
+		return 0;
+
 	if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
 		return 1;