diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-28 00:14:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-28 00:14:16 +0200 |
| commit | 606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf (patch) | |
| tree | 0308f6a10f937f8603f73c07568b68bcd6208b49 /board | |
| parent | 88a85fb9f3578f513d7053ac9a3f1ff7521b2771 (diff) | |
| parent | 1fbd0c36daeb2340210bbd68ee2f62f26a8bdfa0 (diff) | |
| download | talos-obmc-uboot-606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf.tar.gz talos-obmc-uboot-606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
* 'master' of git://git.denx.de/u-boot-microblaze:
microblaze: Fix strict-aliasing rules for in_be32
microblaze: Wire up axi_ethernet driver initialization
Diffstat (limited to 'board')
| -rw-r--r-- | board/xilinx/microblaze-generic/microblaze-generic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 9b2952f04e..c4c13a6682 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -72,6 +72,12 @@ int fsl_init2 (void) { int board_eth_init(bd_t *bis) { int 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; |
