diff options
| author | Tom Rini <trini@ti.com> | 2013-09-06 20:25:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-09-06 20:25:35 -0400 |
| commit | 47f75cf2e1d8648e3438630f3a4bddf9b5caa25d (patch) | |
| tree | 1d0f8f8943d44245381f255a059e258c696bc5a8 /board/xilinx/zynq | |
| parent | 1affd4d4a3fe512050e1ad1636d9360c670da531 (diff) | |
| parent | 68e1747f9c0506159e8ecc9a4feb58e9c65a7b39 (diff) | |
| download | u-boot-imx-47f75cf2e1d8648e3438630f3a4bddf9b5caa25d.zip u-boot-imx-47f75cf2e1d8648e3438630f3a4bddf9b5caa25d.tar.gz u-boot-imx-47f75cf2e1d8648e3438630f3a4bddf9b5caa25d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/xilinx/zynq')
| -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; } |