Albert ARIBAUD a19b0dd62d Merge branch 'u-boot/master' into 'u-boot-arm/master' ...

Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c

2013-05-30 14:45:06 +02:00

..

Makefile

drivers/mmc: move spl_mmc.c to common/spl

2013-05-15 08:41:03 -04:00

spl_mmc.c

drivers/mmc: move spl_mmc.c to common/spl

2013-05-15 08:41:03 -04:00

spl_nand.c

SPL: NAND: Move arch/arm/cpu/armv7/omap-common/spl_nand.c to common/spl

2012-09-27 09:50:00 -07:00

spl_net.c

OMAP: networking support for SPL

2012-10-01 10:02:14 -07:00

spl_nor.c

SPL: Add NOR flash booting support

2012-09-27 11:20:27 -07:00

spl_onenand.c

SPL: ONENAND: Support SPL to boot u-boot from OneNAND.

2013-03-11 11:05:49 -04:00

spl_ymodem.c

…

spl.c

Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

2013-05-11 22:24:28 +02:00