]> git.sur5r.net Git - u-boot/commitdiff
Merge 'u-boot-microblaze/mainline/arm' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 21 Feb 2013 15:43:19 +0000 (16:43 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 21 Feb 2013 15:43:19 +0000 (16:43 +0100)
This pulls the three following ZYNQ commits into ARM master:

7dca54f8: xilinx: zynq: Enable DCC and create new zynq_dcc board
59c651f4: arm: zynq: Add SLCR support with system reset
00ed3458: arm: zynq: Add lowlevel initialization to C

1  2 
boards.cfg

diff --cc boards.cfg
Simple merge