]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
projects / karo-tx-uboot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f024f6 00ed345)
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 patch | diff1 | diff2 | blob | history

diff --cc boards.cfg
Simple merge
UBoot for KaRo TX COM modules