diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-11-03 11:35:42 -0500 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2009-12-13 21:31:26 -0800 |
| commit | 6ac59c5518e1d2e2ef1c4b8dee99267dfbdf9cdc (patch) | |
| tree | f238a4a01f6612b4c7f23a460f196c4a90d41f87 /net/eth.c | |
| parent | 4b142febff71eabdb7ddbb125c7b583b24ddc434 (diff) | |
| download | u-boot-imx-6ac59c5518e1d2e2ef1c4b8dee99267dfbdf9cdc.zip u-boot-imx-6ac59c5518e1d2e2ef1c4b8dee99267dfbdf9cdc.tar.gz u-boot-imx-6ac59c5518e1d2e2ef1c4b8dee99267dfbdf9cdc.tar.bz2 | |
net: pull CONFIG checks out of source and into makefile
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'net/eth.c')
| -rw-r--r-- | net/eth.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -26,7 +26,6 @@ #include <net.h> #include <miiphy.h> -#ifdef CONFIG_CMD_NET void eth_parse_enetaddr(const char *addr, uchar *enetaddr) { char *end; @@ -60,9 +59,8 @@ int eth_getenv_enetaddr_by_index(int index, uchar *enetaddr) sprintf(enetvar, index ? "eth%daddr" : "ethaddr", index); return eth_getenv_enetaddr(enetvar, enetaddr); } -#endif -#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) +#ifdef CONFIG_NET_MULTI /* * CPU and board-specific Ethernet initializations. Aliased function @@ -492,7 +490,8 @@ char *eth_get_name (void) { return (eth_current ? eth_current->name : "unknown"); } -#elif defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) + +#else /* !CONFIG_NET_MULTI */ #warning Ethernet driver is deprecated. Please update to use CONFIG_NET_MULTI |