From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Tue, 2 Jul 2013 08:35:13 -0400 Subject: [U-Boot] [PATCH v2] cmd_bootm.c: Correct BOOTM_ERR_OVERLAP handling In-Reply-To: <51D2B04F.5090003@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> Message-ID: <51D2C901.8000805@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 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. On avr32 this means > currently: > > ---8<--- ## Booting kernel from Legacy Image@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. The patch I posted yesterday should fix that. - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJR0skAAAoJENk4IS6UOR1WlV8P/iK99NqU9/FDg3CfLs+1m+99 MYJfFEAeDgOUkCzu6haT8xPumuwmhg/03xohXMUYYw+YdeZb8wGC4YwV1iFO+kxO Nz9ru6lrYyNACq6NYg9Kiasvjp8Mn9DDPKTLyEt2QeIlP/1hpvnkag6jnHJlhNvl Kyf4yHhT+ksIVbaIryWWohEf6VAghMOYvqU00tQdWvPYpVEqi2x0dHl6WsQPv7/V xt7b+VF2pCFp8Bt4fRrGazZQuIM0T4Vw8AtBnyhpQsc+3VRfx5cbw8AZurq5BfPN wQ6YGX/0tyPA6QSMkofP02/S8WVl//8ZJW+RDIq+d+klpIoujC6jggT3OQ4llSlW Yl61lKFgkyk6+pkLOIRqlq2E+nkPCVtrmLUVYrYXKMHTyjNHhmsjYjJUpKJHHG1z Kg/zGBBrpqzv1oNgKZ/rR1YIPHd/6W+hmMozYEeGTjhGnGM2eq57X4/WUNXvAdWh lxuUrBttTn9IljsfxpxbN2fT9dVNmdyTxd8p6rOJTTu72Ooi7Wfsv5Laww1Y7jtn KNywZTUtGaCoqs/v3JhktbV8iAjrp6euoTGF9A6I2bI+VF58Y8s9dwA7JPHgh27r ngFg/tmAl9p1mv8C3Wt1K3jKPMDz+dzPZpmBcVqLTFBi6oEhkl0XtdmHs2YRXFEr xRxCcxxOWgXe7EInP/sg =3VVT -----END PGP SIGNATURE-----