diff options
author | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 16:38:46 -0500 |
---|---|---|
committer | Justin Waters <justin@justin-linux.(none)> | 2008-01-22 11:25:35 -0500 |
commit | 405bb978ee2321b6cf5381a012c812bdc7679e40 (patch) | |
tree | fcab2b9817cbadafc512f39972468ea9ccecc8d5 /board/at91sam9260ek/dm9161a.c | |
parent | 3c7ac4df9c9718e0bf11705a1a4d0e4b9dae700f (diff) |
Fix various configuration problems with Atmel patch
The CMD API has changed significantly since the patches were originally written. This fixes these problems and cleans up the code a little.
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'board/at91sam9260ek/dm9161a.c')
-rw-r--r-- | board/at91sam9260ek/dm9161a.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/board/at91sam9260ek/dm9161a.c b/board/at91sam9260ek/dm9161a.c index 135e2e1127..4590af077a 100644 --- a/board/at91sam9260ek/dm9161a.c +++ b/board/at91sam9260ek/dm9161a.c @@ -26,8 +26,7 @@ #include <dm9161.h> #ifdef CONFIG_DRIVER_ETHER - -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#ifdef CONFIG_CMD_NET /* * Name: @@ -97,7 +96,7 @@ static uchar dm9161a_GetLinkSpeed (AT91PS_EMAC p_mac) return TRUE; } - if ((stat1 & DM9161_100BASE_T4_HD) && (stat2 & DM9161_100HDX)) { + if ((stat1 & DM9161_100BASE_TX_HD) && (stat2 & DM9161_100HDX)) { /*set MII for 100BaseTX and Half Duplex */ p_mac->EMAC_NCFGR = (p_mac->EMAC_NCFGR & ~(AT91C_EMAC_SPD | AT91C_EMAC_FD)) @@ -295,7 +294,6 @@ void at91_GetPhyInterface(AT91PS_PhyOps p_phyops) p_phyops->Reset = dm9161a_ResetPhy; } -#endif /* CONFIG_COMMANDS & CFG_CMD_NET */ - +#endif /* CONFIG_CMD_NET */ #endif /* CONFIG_DRIVER_ETHER */ |