diff options
| author | wdenk <wdenk> | 2004-09-29 22:43:59 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-09-29 22:43:59 +0000 |
| commit | a06752e36be7fc74b4a928026b63b1bf1764497e (patch) | |
| tree | b71ddbcee4e4cc03e8ea98738b605a1c3879a703 /board/xilinx/xilinx_enet | |
| parent | da93ed8147a000505ac7b7ed4e2fb50532596a3c (diff) | |
* Patch by Sean Chang, 9 Aug 2004:
- Added I2C support for ML300.
- Added support for ML300 to read out its environment information
stored on the EEPROM.
- Added support to use board specific parameters as part of
U-Boot's environment information.
- Updated MLD files to support configuration for new features
above.
* Patches by Travis Sawyer, 5 Aug 2004:
- Remove incorrect bridge settings for eth group 6
- Add call to setup bridge in ppc_440x_eth_initialize
- Fix ppc_440x_eth_init to reset the phy only if its the
first time through, otherwise, just check the phy for the
autonegotiated speed/duplex. This allows the use of netconsole
- only print the speed/duplex the first time the phy is reset.
Diffstat (limited to 'board/xilinx/xilinx_enet')
| -rw-r--r-- | board/xilinx/xilinx_enet/emac_adapter.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/board/xilinx/xilinx_enet/emac_adapter.c b/board/xilinx/xilinx_enet/emac_adapter.c index a3c37baab9..bf8cf0bccb 100644 --- a/board/xilinx/xilinx_enet/emac_adapter.c +++ b/board/xilinx/xilinx_enet/emac_adapter.c @@ -56,8 +56,10 @@ static XEmac Emac; static char etherrxbuff[PKTSIZE_ALIGN]; /* Receive buffer */ -/* hardcoded MAC address for the Xilinx EMAC Core */ +/* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/ +#ifdef CFG_ENV_IS_NOWHERE static u8 EMACAddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 }; +#endif static int initialized = 0; @@ -86,8 +88,11 @@ eth_init(bd_t * bis) /* make sure the Emac is stopped before it is started */ (void) XEmac_Stop(&Emac); +#ifdef CFG_ENV_IS_NOWHERE memcpy(bis->bi_enetaddr, EMACAddr, 6); - Result = XEmac_SetMacAddress(&Emac, EMACAddr); +#endif + + Result = XEmac_SetMacAddress(&Emac, bis->bi_enetaddr); if (Result != XST_SUCCESS) { return 0; } |