diff options
author | Albert ARIBAUD | 2013-02-21 09:43:19 -0600 |
---|---|---|
committer | Albert ARIBAUD | 2013-02-21 09:43:19 -0600 |
commit | 03268374db9133686b738acca212247023840ffc (patch) | |
tree | c511f6501522c2e8cf02edc85024aeb5042e792a /boards.cfg | |
parent | 9f024f62e4604274a23213dcee30016092e32e7b (diff) | |
parent | 00ed34589880ca7092999ec5b92e061018d0fd0f (diff) | |
download | u-boot-03268374db9133686b738acca212247023840ffc.tar.gz u-boot-03268374db9133686b738acca212247023840ffc.tar.xz u-boot-03268374db9133686b738acca212247023840ffc.zip |
Merge 'u-boot-microblaze/mainline/arm' into 'u-boot-arm/master'
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
Diffstat (limited to 'boards.cfg')
-rw-r--r-- | boards.cfg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/boards.cfg b/boards.cfg index b1319aace0..28608596a6 100644 --- a/boards.cfg +++ b/boards.cfg | |||
@@ -301,6 +301,7 @@ snowball arm armv7 snowball st-e | |||
301 | kzm9g arm armv7 kzm9g kmc rmobile | 301 | kzm9g arm armv7 kzm9g kmc rmobile |
302 | armadillo-800eva arm armv7 armadillo-800eva atmark-techno rmobile | 302 | armadillo-800eva arm armv7 armadillo-800eva atmark-techno rmobile |
303 | zynq arm armv7 zynq xilinx zynq | 303 | zynq arm armv7 zynq xilinx zynq |
304 | zynq_dcc arm armv7 zynq xilinx zynq zynq:ZYNQ_DCC | ||
304 | socfpga_cyclone5 arm armv7 socfpga_cyclone5 altera socfpga | 305 | socfpga_cyclone5 arm armv7 socfpga_cyclone5 altera socfpga |
305 | actux1_4_16 arm ixp actux1 - - actux1:FLASH2X2 | 306 | actux1_4_16 arm ixp actux1 - - actux1:FLASH2X2 |
306 | actux1_4_32 arm ixp actux1 - - actux1:FLASH2X2,RAM_32MB | 307 | actux1_4_32 arm ixp actux1 - - actux1:FLASH2X2,RAM_32MB |