From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Tue, 2 Jul 2013 09:01:37 -0400 Subject: [U-Boot] [PATCH v2] cmd_bootm.c: Correct BOOTM_ERR_OVERLAP handling In-Reply-To: <51D2CE5E.3050802@gmail.com> References: <1372443665-9584-1-git-send-email-trini@ti.com> <1372451133-30779-1-git-send-email-trini@ti.com> <51D2B04F.5090003@gmail.com> <51D2C901.8000805@ti.com> <51D2CE5E.3050802@gmail.com> Message-ID: <51D2CF31.3070101@ti.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 07/02/2013 08:58 AM, Andreas Bie?mann wrote: > On 07/02/2013 02:35 PM, Tom Rini wrote: >> On 07/02/2013 06:49 AM, Andreas Bie?mann wrote: >>> 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 >>>> wrote: >> >>> >> >>>>> @@ -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. > > > >>> Who will fix that? I'll have a look for the avr32 specific >>> part. >> >> The patch I posted yesterday should fix that. > > Oups, overseen, you mean http://patchwork.ozlabs.org/patch/256125/ > right? Correct. - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJR0s8xAAoJENk4IS6UOR1WuZAQAI2vkozEJyPKY6+6q7k3OOPP P51Iut61IFYNREl9lYXXY/w6W08IC+K5SMD+4OvQZDhHJdYZBuOhXJjS9QlABQlg 9CE5nUvC3brhBJ90LIgno+6z02U1BmX/ackRe6fEGyOopBpibmsQGL7P2RhjX+Mo g1oz/KisXJBsb+ZLQJptfuu5ZzQgjP2HT9z5yKmXXqJWWDayEOMHGcw2mlUIUgdE xz/wm7mA45srwJfi/dRwavo4unswMOYFz8VzktCpQbVwIxgAkO7WmOYcxCkxFQ2t 3JZQVkrM6NL/b99ByZqrQy9FkmJotiWc/u4bQ3x1kn9KKxa+MSm4+NNS/UTc7dWh z/wZ5DMNB9wYAzro0tVxLd7y6gZhOkhUCHsWUxV0ma0r8wd2sx3dLC85DwPpo2WA JxWKAsJdY+NAs9phiVZ7h1iBMA/ekauRUtFJC9ahcCJf54AR89ppDWOY2Avxb+Y9 i6eX4jNUMJCjvJqzQL8M8gmJgnR1yXEAXylieIWgAzDU5ymIvxl6SvrzPCqxiTIX YqZvjJkCxtDIDc1A5i4MkAnrogKIhoEH+2J6MzMpi+OZ1n+GyBaGuP2zcC9N5cD8 hJIXfsO8SepQJy+cAkE+9nOH5WvzdElMkUIPkZuhHYNzoMO83P5W6SE+mr/Qd+b6 948eA/6mlg1CopxPo8HU =DxRB -----END PGP SIGNATURE-----