diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:48:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:48:09 +0200 |
| commit | 1a5017601f6d17caedaa2bf069485d3e4155f1c0 (patch) | |
| tree | 342b39d2a55eb4ebaf8b772bc8b74db4318d5eb7 /cpu/mips/au1x00_eth.c | |
| parent | cdeb62e20d94005f2e80604fda03b498c3a6f704 (diff) | |
| parent | 79b51ff8205f0354d5300570614c1d2db499679c (diff) | |
| download | u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.zip u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.gz u-boot-imx-1a5017601f6d17caedaa2bf069485d3e4155f1c0.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
Diffstat (limited to 'cpu/mips/au1x00_eth.c')
| -rw-r--r-- | cpu/mips/au1x00_eth.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c index d70c5fe..d0cf8e0 100644 --- a/cpu/mips/au1x00_eth.c +++ b/cpu/mips/au1x00_eth.c @@ -23,8 +23,6 @@ */ #include <config.h> -#ifdef CONFIG_AU1X00 - #if defined(CFG_DISCOVER_PHY) #error "PHY not supported yet" /* We just assume that we are running 100FD for now */ @@ -33,20 +31,20 @@ /* I assume ethernet behaves like au1000 */ -#ifdef CONFIG_AU1000 +#ifdef CONFIG_SOC_AU1000 /* Base address differ between cpu:s */ #define ETH0_BASE AU1000_ETH0_BASE #define MAC0_ENABLE AU1000_MAC0_ENABLE #else -#ifdef CONFIG_AU1100 +#ifdef CONFIG_SOC_AU1100 #define ETH0_BASE AU1100_ETH0_BASE #define MAC0_ENABLE AU1100_MAC0_ENABLE #else -#ifdef CONFIG_AU1500 +#ifdef CONFIG_SOC_AU1500 #define ETH0_BASE AU1500_ETH0_BASE #define MAC0_ENABLE AU1500_MAC0_ENABLE #else -#ifdef CONFIG_AU1550 +#ifdef CONFIG_SOC_AU1550 #define ETH0_BASE AU1550_ETH0_BASE #define MAC0_ENABLE AU1550_MAC0_ENABLE #else @@ -307,5 +305,3 @@ int au1x00_enet_initialize(bd_t *bis){ return 1; } - -#endif /* CONFIG_AU1X00 */ |