u-boot.git/common/spl, branch v2013.10-rc2

Merge branch 'master' of git://88.191.163.10/u-boot-arm

2013-08-18T18:14:34+00:00

Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
	arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini

SPL: Limit image name print length

2013-08-16T17:45:15+00:00

If image name is longer than 32 bytes, then it will be truncated.
This will remove '\0' at the end of the line, so printf will
go out of string limit.

Signed-off-by: Taras Kondratiuk 
Reviewed-by: Tom Rini

spl_mmc.c: Detect missing kernel image in RAW MMC

2013-07-26T20:39:10+00:00

Currently, we assume that if we can read from MMC correctly, we have
found a valid image.  This is not the case as an empty area will read
just fine.  Add a check for a valid IH_MAGIC.

Signed-off-by: Tom Rini 
Reviewed-by: Peter Korsgaard

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24T13:44:38+00:00

Signed-off-by: Wolfgang Denk 
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini

spl_mmc: add Falcon mode support for raw variant

2013-06-07T18:17:00+00:00

If Falcon mode support is enabled (and the system isn't directed into
booting u-boot), it will instead try to load kernel from sector
CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR and
CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS of kernel argument parameters
starting from sector CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR.

Signed-off-by: Peter Korsgaard

spl_mmc: mmc_load_image_raw(): Add sector argument

2013-06-07T18:17:00+00:00

So we can use it for falcon mode as well.

Signed-off-by: Peter Korsgaard

spl_mmc: add Falcon mode support for FAT variant

2013-06-07T18:17:00+00:00

If Falcon mode support is enabled (and the system isn't directed into
booting u-boot), it will instead try to load kernel from
CONFIG_SPL_FAT_LOAD_KERNEL_NAME file and kernel argument parameters from
CONFIG_SPL_FAT_LOAD_ARGS_NAME, both from the same partition as u-boot.

Signed-off-by: Peter Korsgaard

spl_mmc: mmc_load_image_fat(): Add filename argument and move fat init out

2013-06-07T12:37:48+00:00

So we can use it for falcon mode as well.

Signed-off-by: Peter Korsgaard

spl_mmc: return error from mmc_load_image_{raw, fat} rather than hanging

2013-06-07T12:37:48+00:00

So we can instead fallback to doing something else on errors.

Signed-off-by: Peter Korsgaard

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

2013-05-30T12:45:06+00:00

Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c