diff options
| author | Tom Rini <trini@ti.com> | 2015-01-26 06:42:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-26 06:42:15 -0500 |
| commit | 306df2c8241bd363c71a99841630fb5e85d81fae (patch) | |
| tree | d2fda7cc2345460a5a852f2bdbd0f0a51095e7eb /board/xilinx/zynq | |
| parent | 03cae7261e00e0b36511625ed88f883187c17c77 (diff) | |
| parent | a2425e6207d7c75906a15410f4c8c0a5d0519349 (diff) | |
| download | blackbird-obmc-uboot-306df2c8241bd363c71a99841630fb5e85d81fae.tar.gz blackbird-obmc-uboot-306df2c8241bd363c71a99841630fb5e85d81fae.zip | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'board/xilinx/zynq')
| -rw-r--r-- | board/xilinx/zynq/board.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 3a2198f8e8..738c31c6ee 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -91,6 +91,14 @@ int board_late_init(void) return 0; } +#ifdef CONFIG_DISPLAY_BOARDINFO +int checkboard(void) +{ + puts("Board:\tXilinx Zynq\n"); + return 0; +} +#endif + int board_eth_init(bd_t *bis) { u32 ret = 0; @@ -115,11 +123,13 @@ int board_eth_init(bd_t *bis) #if defined(CONFIG_ZYNQ_GEM) # if defined(CONFIG_ZYNQ_GEM0) ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR0, - CONFIG_ZYNQ_GEM_PHY_ADDR0, 0); + CONFIG_ZYNQ_GEM_PHY_ADDR0, + CONFIG_ZYNQ_GEM_EMIO0); # endif # if defined(CONFIG_ZYNQ_GEM1) ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR1, - CONFIG_ZYNQ_GEM_PHY_ADDR1, 0); + CONFIG_ZYNQ_GEM_PHY_ADDR1, + CONFIG_ZYNQ_GEM_EMIO1); # endif #endif return ret; |
