Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 00:49:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/arch/arm
History
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
..
cpu Merge u-boot/master into u-boot-ti/master 2013-03-11 12:16:13 -04:00
dts Tegra114: Dalmore: Add DT files 2013-02-11 10:35:25 -07:00
imx-common Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-02-12 10:18:31 -05:00
include/asm Merge u-boot/master into u-boot-ti/master 2013-03-11 12:16:13 -04:00
lib arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README 2013-02-11 10:35:26 -07:00
config.mk arm: work around assembler bug 2012-10-04 14:19:04 +02:00