diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-03 14:01:02 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-03 14:01:02 +0200 |
| commit | 6d4511b2c6734842de9de21c1bc0db4c3ea28b72 (patch) | |
| tree | c676e6d3847b50f44f87afab50dc125fae6f1b84 /board | |
| parent | fb18fa95a14ae875ef0a5421cd9fecc00c7c3a4c (diff) | |
| parent | 2d83d33a51926d6471eb9282d03d83783850d565 (diff) | |
| download | u-boot-imx-6d4511b2c6734842de9de21c1bc0db4c3ea28b72.zip u-boot-imx-6d4511b2c6734842de9de21c1bc0db4c3ea28b72.tar.gz u-boot-imx-6d4511b2c6734842de9de21c1bc0db4c3ea28b72.tar.bz2 | |
Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'
Conflicts:
arch/arm/include/asm/arch-zynq/hardware.h
The conflict above was trivial and solved during merge.
Diffstat (limited to 'board')
| -rw-r--r-- | board/xilinx/zynq/board.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index c173f0c..f7f1c59 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -65,6 +65,23 @@ int board_eth_init(bd_t *bis) { u32 ret = 0; +#ifdef CONFIG_XILINX_AXIEMAC + ret |= xilinx_axiemac_initialize(bis, XILINX_AXIEMAC_BASEADDR, + XILINX_AXIDMA_BASEADDR); +#endif +#ifdef CONFIG_XILINX_EMACLITE + u32 txpp = 0; + u32 rxpp = 0; +# ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG + txpp = 1; +# endif +# ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG + rxpp = 1; +# endif + ret |= xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR, + txpp, rxpp); +#endif + #if defined(CONFIG_ZYNQ_GEM) # if defined(CONFIG_ZYNQ_GEM0) ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR0, @@ -100,5 +117,7 @@ int dram_init(void) { gd->ram_size = CONFIG_SYS_SDRAM_SIZE; + zynq_ddrc_init(); + return 0; } |