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

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: 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

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

2013-07-12T11:20:35+00:00

mx53ard: Change default environment to cope with OE changes

2013-07-12T11:05:42+00:00

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador 
Acked-by: Fabio Estevam

mx51evk: Change default environment to cope with OE changes

2013-07-12T11:05:18+00:00

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador 
Acked-by: Stefano Babic

wandboard: Change default environment to cope with OE changes

2013-07-12T11:05:03+00:00

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador 
Acked-by: Fabio Estevam

mx6slevk: Change default environment to cope with OE changes

2013-07-12T11:04:52+00:00

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador 
Acked-by: Fabio Estevam

mx6qsabrelite: Change default environment to cope with OE changes

2013-07-12T11:04:36+00:00

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador 
Acked-by: Fabio Estevam

mx53loco: Change default environment to cope with OE changes

2013-07-12T11:04:13+00:00

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador 
Acked-by: Jason Liu

m28evk: add trimffs to nand command

2013-07-12T07:23:55+00:00

this is usefull when writing an UBI image which contains
and UBIFS volume (check README.nand and UBI FAQ for more
details)

Signed-off-by: Marek Vasut 
Cc: Stefano Babic