u-boot.git/arch/arm/include, branch v2015.07

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

2015-07-07T12:42:35Z

Revert "break build if it would produce broken binary"

2015-07-07T09:39:36Z

The root cause of this problem should now be fixed. This reverts commit a6a4c542d316b3401f0840ac5378743191bca851. Signed-off-by: Simon Glass Acked-by: Pavel Machek Tested-by: Pavel Machek

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

2015-07-06T01:22:22Z

sunxi: Add support for UART0 in PB pin group on A33

2015-07-05T09:32:11Z

The A33 adds a pinmux function for UART0 in the PB pin group. Signed-off-by: Chen-Yu Tsai Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede

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

2015-07-03T12:41:02Z

Conflicts: configs/tbs2910_defconfig configs/tqma6q_mba6_mmc_defconfig configs/tqma6q_mba6_spi_defconfig configs/tqma6s_mba6_mmc_defconfig configs/tqma6s_mba6_spi_defconfig include/configs/mx6_common.h Signed-off-by: Tom Rini

Revert "sunxi/nand: Add support to the SPL for loading u-boot from internal NAND memory"

2015-06-28T15:46:31Z

This reverts commit f76eba38b3eda905ff3bdc18dd1240d3dcbc6e5a. This patch did not have a full and proper copyright/S-o-b chain. Signed-off-by: Ian Campbell Conflicts: include/configs/sun6i.h include/configs/sun8i.h

imx: mx6 introuduce macro is_mx6dqp

2015-06-27T16:18:54Z

Add a new revision CHIP_REV_2_0. Introudce macro is_mx6dqp, dqp means Dual/Quad Plus. Since Dual/Quad Plus use same cpu type with Dual/Quad, but different revision(Major Lower), we use this macro for Dual/Quad Plus. Signed-off-by: Ye.Li Signed-off-by: Peng Fan

imx: mx6 correct is_soc_rev usage

2015-06-27T16:16:31Z

is_soc_rev should return a bool value, so use "==", but not "-", change (is_soc_rev(CHIP_REV_1_0) > 0) to (soc_rev() > CHIP_REV_1_0). This patch also add space between "&" for cpu_type(rev) macro. Signed-off-by: Peng Fan

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

2015-06-16T00:45:50Z

am33xx: Re-enable SW levelling for DDR2

2015-06-15T14:57:26Z

The recent changes for hw leveling on am33xx were not intended for DDR2 boards, only DDR3. Update emif_sdram_type to take a sdram_config value to check against. This lets us pass in the value we would use to configure, when we have not yet configured the board yet. In other cases update the call to be as functional as before and check an already programmed value in. Tested-by: Yan Liu Signed-off-by: Tom Rini Signed-off-by: Lokesh Vutla