u-boot.git/board, branch v2015.01-rc2

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

2014-11-24T22:05:11Z

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

2014-11-24T17:02:12Z

Merge git://git.denx.de/u-boot-dm

2014-11-24T17:01:48Z

Conflicts: drivers/serial/serial-uclass.c Signed-off-by: Tom Rini

Merge git://git.denx.de/u-boot-x86

2014-11-24T17:00:00Z

Conflicts: arch/x86/cpu/Makefile Signed-off-by: Tom Rini

mx6boards: Fix error handling in board_mmc_init()

2014-11-24T11:10:18Z

When an invalid USDHC port is passed we should return -EINVAL instead of 0. Also, return the error immediately on fsl_esdhc_initialize() failure. Cc: Eric Benard Signed-off-by: Fabio Estevam

nitrogen6x: Fix error handling in board_mmc_init()

2014-11-24T11:10:18Z

When an invalid USDHC port is passed we should return -EINVAL instead of 0. Also, return the error immediately on fsl_esdhc_initialize() failure. Cc: Eric Nelson Signed-off-by: Fabio Estevam

ot1200: Fix error handling in board_mmc_init()

2014-11-24T11:10:18Z

When an invalid USDHC port is passed we should return -EINVAL instead of 0. Also, return the error immediately on fsl_esdhc_initialize() failure. Cc: Christian Gmeiner Signed-off-by: Fabio Estevam

arm: mx6: cm_fx6: implement board specific sata stop

2014-11-24T11:00:00Z

Provide board specific implementation for sata stop command for cm_fx6. Signed-off-by: Nikita Kiryanov Cc: Stefano Babic

gw_ventana: Use the generic spl_sd.cfg

2014-11-24T10:59:59Z

gw_ventana can boot from SPI or NAND and both of these interfaces boot from the same 0x400 offset. This means that we could simplify the code and replace the custom gw_ventana.cfg with the generic spl_sd.cfg, as it provides the same boot offset of 0x400. Cc: Tim Harvey Signed-off-by: Fabio Estevam

ARM: Add arch/arm/cpu/armv7/Kconfig with non-secure and virt options

2014-11-24T08:09:49Z

Add arch/arm/cpu/armv7/Kconfig with non-secure and virt options, this is a preparation patch for adding an env variable to choose between secure / non-secure boot on non-secure boot capable systems, specifically this prepares for adding CONFIG_ARMV7_BOOT_SEC_DEFAULT as a proper Kconfig option. Signed-off-by: Hans de Goede