diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-04-09 17:10:01 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-04-09 17:10:01 +0200 |
| commit | 2c734cd932b53b46e9f89e4f5db9360afc459ae6 (patch) | |
| tree | c8992dba1b7bfc79ed7248b692d50facbe1b2dc3 /include/configs | |
| parent | 691288e14dc5cccc9ff1219765554981f73a7c14 (diff) | |
| parent | cafabe1995af20d02a000a984ae38693a6f9b900 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
* 'master' of git://git.denx.de/u-boot-net:
net/designware: Change timeout loop implementation
net/designware: Set ANAR to 0x1e1
net/designware: Program phy registers when auto-negotiation is ON
net/designware: Try configuring phy on each dw_eth_init
net/designware: Consecutive writes must have delay
net/designware: Phy address fix
net/designware: Fix the max frame length size
net/designware: Fix to restore hw mac address
microblaze: Wire up LL_TEMAC driver initialization
microblaze: Add faked LL_TEMAC driver configuration
microblaze: Enable several ethernet driver compilation
net: ll_temac: Add LL TEMAC driver to u-boot
Update net subsystem maintainer in doc/git-mailrc
net/eth.c: fix eth_write_hwaddr() to use dev->enetaddr as fall back
mvgbe: remove warning for unused methods
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/microblaze-generic.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 9f66fbfc3f..efca13608b 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -65,11 +65,12 @@ /* ethernet */ #undef CONFIG_SYS_ENET -#ifdef XILINX_EMACLITE_BASEADDR -# define CONFIG_XILINX_EMACLITE 1 +#if defined(XILINX_EMACLITE_BASEADDR) +# define CONFIG_XILINX_EMACLITE 1 # define CONFIG_SYS_ENET -#elif XILINX_LLTEMAC_BASEADDR -# define CONFIG_XILINX_LL_TEMAC 1 +#endif +#if defined(XILINX_LLTEMAC_BASEADDR) +# define CONFIG_XILINX_LL_TEMAC 1 # define CONFIG_SYS_ENET #endif #if defined(XILINX_AXIEMAC_BASEADDR) @@ -339,7 +340,7 @@ #define CONFIG_FIT 1 #define CONFIG_OF_LIBFDT 1 -#if defined(CONFIG_XILINX_AXIEMAC) +#if defined(CONFIG_XILINX_LL_TEMAC) || defined(CONFIG_XILINX_AXIEMAC) # define CONFIG_MII 1 # define CONFIG_CMD_MII 1 # define CONFIG_PHY_GIGE 1 |