mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-27 20:38:52 +09:00
![]() 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> |
||
---|---|---|
.. | ||
nand | ||
onenand | ||
spi | ||
ubi | ||
at45.c | ||
cfi_flash.c | ||
cfi_mtd.c | ||
dataflash.c | ||
ftsmc020.c | ||
jedec_flash.c | ||
Makefile | ||
mtdconcat.c | ||
mtdcore.c | ||
mtdpart.c | ||
mw_eeprom.c | ||
st_smi.c |