Tom Rini 76b40ab41e Merge u-boot/master into u-boot-ti/master ...

In master we had already taken a patch to fix the davinci GPIO code for
CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support
DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850).  Resolve these
conflicts manually and comment the #else/#endif lines for clarity.

Conflicts:
	arch/arm/include/asm/arch-davinci/gpio.h
	drivers/gpio/da8xx_gpio.c

Signed-off-by: Tom Rini <trini@ti.com>

2013-03-11 12:16:13 -04:00

..

Makefile

…

twister.c

Merge u-boot/master into u-boot-ti/master

2013-03-11 12:16:13 -04:00

twister.h

OMAP3: drop CONFIG_SPL_OS_BOOT_KEY and use local define

2013-03-01 12:01:32 -05:00