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 /cpu | |
| 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 'cpu')
| -rw-r--r-- | cpu/arm926ejs/at91sam926x/ether.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpu/arm926ejs/at91sam926x/ether.c b/cpu/arm926ejs/at91sam926x/ether.c index 46b9b98528..fc58c4af4c 100644 --- a/cpu/arm926ejs/at91sam926x/ether.c +++ b/cpu/arm926ejs/at91sam926x/ether.c @@ -25,14 +25,13 @@ #ifndef CONFIG_DRIVER_DM9000 /* SAM9261EK uses DM9000 Phy */ #ifdef CONFIG_DRIVER_ETHER -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#ifdef CONFIG_CMD_NET #include <net.h> #include <at91_net.h> #include <miiphy.h> #include <dm9161.h> - /* ----- Ethernet Buffer definitions ----- */ /* Receive Transfer descriptor structure */ @@ -254,10 +253,10 @@ int AT91F_EMACInit(bd_t * bd, if (tick == AT91C_ETH_TIMEOUT) { - printf ("-E- Autonegociation Timeout\n\r"); + printf ("-E- Autonegotiation Timeout\n\r"); return 1; } else - printf ("End of Autonegociation\n\r"); + printf ("End of Autonegotiation\n\r"); /* the sequence write EMAC_SA1L and write EMAC_SA1H must be respected */ p_mac->EMAC_SA1L = (bd->bi_enetaddr[3] << 24) | (bd->bi_enetaddr[2] << 16) @@ -449,6 +448,6 @@ void eth_halt (void) { }; -#endif /* CONFIG_COMMANDS & CFG_CMD_NET */ +#endif /* CONFIG_CMD_NET */ #endif /* CONFIG_DRIVER_DM9000 */ #endif /* CONFIG_DRIVER_ETHER */ |