u-boot.git, branch v2013.07-rc3

Prepare v2013.07-rc3

2013-07-12T21:19:03+00:00

Signed-off-by: Tom Rini

Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

2013-07-12T21:18:59+00:00

bootm: Handle errors consistently

2013-07-12T21:16:37+00:00

A recent bootm fix left the error path incomplete. If CONFIG_TRACE is
set it may still not be a supported command, so cover that with the
unsupported subcommand print.  Once we handle BOOTM_STATE_OS_GO, we can
just move into the error handler itself, no need for a goto there.

Signed-off-by: Simon Glass 
[trini: Update slightly based on Simon's changes to also cover
CONFIG_TRACE/BOOTM_STATE_FAKE_OS_GO]
Signed-off-by: Tom Rini

mtd: mxc_nand: Fix crash after MTD resync

2013-07-12T21:12:33+00:00

The driver triggered a BUG() in nand_base.c:3214/nand_scan_tail()
because the ecc.strength was not set in NAND_ECC_HW_SYNDROME ECC
mode.

Signed-off-by: Marek Vasut 
Cc: Benoit Thebaudeau 
Cc: Fabio Estevam 
Cc: Scott Wood 
Cc: Stefano Babic

common/image.c: Fix regression with ramdisk load/entry points in FIT

2013-07-12T19:04:43+00:00

A FIT image with a ramdisk that sets the entry or load points to 0x0
must be treated as meaning "leave in place" and NOT "relocate to 0x0".
This regression was introduced in a51ec63.

Signed-off-by: Stefano Babic

Merge branch 'master' of git://git.denx.de/u-boot-arm

2013-07-12T14:36:48+00:00

Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini

bootm: Correct the arguments for the ELF image loader

2013-07-12T14:32:39+00:00

The arguments were out of place since commit 983c72f, since this file was
missed and not tested. Correct this.

Signed-off-by: Simon Glass

bootm: Use selected configuration for ramdisk and fdt

2013-07-12T14:32:39+00:00

If a specific configuraion is selected by the bootm command, e.g. with
'bootm 84000000#recoveryconf' we must honour this for not just the kernel,
but also the ramdisk and FDT.

In the conversion to using a common fit_image_load() function for loading
images from FITs (commits a51ec63 and 53f375f) this feature was lost.
Reinstate it by passing the selected configuration back from
fit_image_load() to boot_get_kernel(), then use this configuration
(which is stored in images->fit_uname_cfg) in both boot_get_ramdisk()
and boot_get_fdt().

Signed-off-by: Simon Glass

blackfin: x86: bootm: Handle PREP stage of bootm

2013-07-12T14:32:39+00:00

The OS function is now always called with the PREP stage. Adjust the
remaining bootm OS functions to deal with this correctly.

Signed-off-by: Simon Glass

bootm: Remove extra OK message

2013-07-12T14:32:39+00:00

This is not needed as we already print 'OK' later in all cases.

Signed-off-by: Simon Glass