mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-26 17:32:08 +00:00
76b40ab41e
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> |
||
---|---|---|
.. | ||
arm720t | ||
arm920t | ||
arm925t | ||
arm926ejs | ||
arm946es | ||
arm1136 | ||
arm1176 | ||
arm_intcm | ||
armv7 | ||
ixp | ||
pxa | ||
s3c44b0 | ||
sa1100 | ||
tegra-common | ||
tegra20-common | ||
tegra30-common | ||
tegra114-common | ||
u-boot.lds |