Commit 6ac59c55 authored by Mike Frysinger's avatar Mike Frysinger Committed by Ben Warren

net: pull CONFIG checks out of source and into makefile

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent 4b142feb
......@@ -27,14 +27,14 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libnet.a
COBJS-y += bootp.o
COBJS-$(CONFIG_CMD_NET) += bootp.o
COBJS-$(CONFIG_CMD_DNS) += dns.o
COBJS-y += eth.o
COBJS-y += net.o
COBJS-y += nfs.o
COBJS-y += rarp.o
COBJS-$(CONFIG_CMD_NET) += eth.o
COBJS-$(CONFIG_CMD_NET) += net.o
COBJS-$(CONFIG_CMD_NFS) += nfs.o
COBJS-$(CONFIG_CMD_NET) += rarp.o
COBJS-$(CONFIG_CMD_SNTP) += sntp.o
COBJS-y += tftp.o
COBJS-$(CONFIG_CMD_NET) += tftp.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
......
......@@ -20,8 +20,6 @@
#define BOOTP_VENDOR_MAGIC 0x63825363 /* RFC1048 Magic Cookie */
#if defined(CONFIG_CMD_NET)
#define TIMEOUT 5000UL /* Milliseconds before trying BOOTP again */
#ifndef CONFIG_NET_RETRY_COUNT
# define TIMEOUT_COUNT 5 /* # of timeouts before giving up */
......@@ -948,5 +946,3 @@ void DhcpRequest(void)
BootpRequest();
}
#endif /* CONFIG_CMD_DHCP */
#endif /* CONFIG_CMD_NET */
......@@ -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
......
......@@ -96,8 +96,6 @@
#include "dns.h"
#endif
#if defined(CONFIG_CMD_NET)
DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_ARP_TIMEOUT
......@@ -1872,8 +1870,6 @@ void copy_filename (char *dst, char *src, int size)
*dst = '\0';
}
#endif
#if defined(CONFIG_CMD_NFS) || defined(CONFIG_CMD_SNTP) || defined(CONFIG_CMD_DNS)
/*
* make port a little random, but use something trivial to compute
......
......@@ -29,8 +29,6 @@
#include "nfs.h"
#include "bootp.h"
#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_NFS)
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
#define NFS_RETRY_COUNT 30
#define NFS_TIMEOUT 2000UL
......@@ -755,5 +753,3 @@ NfsStart (void)
NfsSend ();
}
#endif
......@@ -29,8 +29,6 @@
#include "rarp.h"
#include "tftp.h"
#if defined(CONFIG_CMD_NET)
#define TIMEOUT 5000UL /* Milliseconds before trying BOOTP again */
#ifndef CONFIG_NET_RETRY_COUNT
# define TIMEOUT_COUNT 5 /* # of timeouts before giving up */
......@@ -116,5 +114,3 @@ RarpRequest (void)
NetSetTimeout(TIMEOUT, RarpTimeout);
NetSetHandler(RarpHandler);
}
#endif
......@@ -10,8 +10,6 @@
#include "tftp.h"
#include "bootp.h"
#if defined(CONFIG_CMD_NET)
#define WELL_KNOWN_PORT 69 /* Well known TFTP port # */
#define TIMEOUT 5000UL /* Millisecs to timeout for lost pkt */
#ifndef CONFIG_NET_RETRY_COUNT
......@@ -690,5 +688,3 @@ static void parse_multicast_oack(char *pkt, int len)
}
#endif /* Multicast TFTP */
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment