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

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

2015-07-07T12:42:35Z

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

2015-07-07T09:38:44Z

armv7: better comment in start.S

2015-07-07T06:04:03Z

Fix big/small letters in comment. Signed-off-by: Pavel Machek Tested-by: Marek Vasut

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

sunxi: rsb: Enable R_PIO clock before configuring external pins

2015-07-05T09:32:11Z

The original code was configuring the external pins after enabling the R_PIO clock, which meant the configuration never made it to the pin controller the first time in SPL. Why this was working before is uncertain. Maybe the state was left from a previous boot sequence, or RSB just happened to be the default configuration. However with some A33 chips, SPL failed to configure the PMIC. This was seen by me and Maxime on the Sinlinx SinA33 dev board. Reordering the calls fixed this. Signed-off-by: Chen-Yu Tsai Cc: Maxime Ripard Tested-by: Maxime Ripard Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede

sunxi: hardware-feature-specific function index defines for PORT F UART0

2015-07-05T09:32:11Z

Commit 487b327 ("sunxi: GPIO pin mux hardware-feature-specific function index defines") renamed all GPIO index defines, but missed the PORT F UART0 setup functions. 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 correct get_cpu_rev

2015-06-27T16:18:40Z