mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-20 03:33:20 +09: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> |
||
---|---|---|
.. | ||
aintc_defs.h | ||
da8xx-fb.h | ||
da8xx-usb.h | ||
da850_lowlevel.h | ||
davinci_misc.h | ||
ddr2_defs.h | ||
dm365_lowlevel.h | ||
emac_defs.h | ||
emif_defs.h | ||
gpio.h | ||
hardware.h | ||
i2c_defs.h | ||
nand_defs.h | ||
pinmux_defs.h | ||
pll_defs.h | ||
psc_defs.h | ||
sdmmc_defs.h | ||
spl.h | ||
syscfg_defs.h | ||
timer_defs.h |