[U-Boot] [PATCH v2] cmd_bootm.c: Correct BOOTM_ERR_OVERLAP handling

[Andreas Bießmann]

Hi all,

On 06/28/2013 11:41 PM, Simon Glass wrote:
> Hi Tom,
> 
> On Fri, Jun 28, 2013 at 1:25 PM, Tom Rini <trini at ti.com> wrote:

<snip>

>> @@ -660,34 +680,25 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int
>> flag, int argc,
>>         }
>>  #endif
>>         /* Now run the OS! We hope this doesn't return */
>> -       if (!ret && (states & BOOTM_STATE_OS_GO))
>> +       if (!ret && (states & BOOTM_STATE_OS_GO)) {
>>                 ret = boot_selected_os(argc, argv, BOOTM_STATE_OS_GO,
>>                                 images, boot_fn, &iflag);
>> +               if (ret)
>> +                       goto err;
>> +       }
>> +
>> +       return ret;
>>
> 
> Thanks for getting to the bottom of this.
> 
> Just a question here - should this fall through to display the error with
> the code below? For example if the subcommand is not supported...

as pointed out by Simon the error message 'subcommand not supported'
disappears with this patch. On avr32 this means currently:

---8<---
## Booting kernel from Legacy Image at 10400000 ...
   Image Name:   Linux-3.6.2
   Image Type:   AVR32 Linux Kernel Image (gzip compressed)
   Data Size:    1846216 Bytes = 1.8 MiB
   Load Address: 10000000
   Entry Point:  90000000
   Verifying Checksum ... OK
   Uncompressing Kernel Image ... OK
U-Boot>
--->8---

Before it was at least:
---8<---
## Booting kernel from Legacy Image at 10400000 ...
   Image Name:   Linux-3.6.2
   Image Type:   AVR32 Linux Kernel Image (gzip compressed)
   Data Size:    1846216 Bytes = 1.8 MiB
   Load Address: 10000000
   Entry Point:  90000000
   Verifying Checksum ... OK
   Uncompressing Kernel Image ... OK
subcommand not supported
U-Boot>
--->8---

Who will fix that? I'll have a look for the avr32 specific part.

Regards

Andreas Bießmann