projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: nfs: Only link in NFS code outside of SPL builds
[oweals/u-boot.git]
/
net
/
net.c
diff --git
a/net/net.c
b/net/net.c
index ded86e7456715ebfc39ce1f52cdd5fd954870963..5114364edd8b544886ab356efe8d4185cdbc9ce8 100644
(file)
--- a/
net/net.c
+++ b/
net/net.c
@@
-308,7
+308,7
@@
U_BOOT_ENV_CALLBACK(dnsip, on_dnsip);
*/
void net_auto_load(void)
{
*/
void net_auto_load(void)
{
-#if defined(CONFIG_CMD_NFS)
+#if defined(CONFIG_CMD_NFS)
&& !defined(CONFIG_SPL_BUILD)
const char *s = env_get("autoload");
if (s != NULL && strcmp(s, "NFS") == 0) {
const char *s = env_get("autoload");
if (s != NULL && strcmp(s, "NFS") == 0) {
@@
-496,7
+496,7
@@
restart:
ping_start();
break;
#endif
ping_start();
break;
#endif
-#if defined(CONFIG_CMD_NFS)
+#if defined(CONFIG_CMD_NFS)
&& !defined(CONFIG_SPL_BUILD)
case NFS:
nfs_start();
break;
case NFS:
nfs_start();
break;
@@
-561,9
+561,6
@@
restart:
*/
for (;;) {
WATCHDOG_RESET();
*/
for (;;) {
WATCHDOG_RESET();
-#ifdef CONFIG_SHOW_ACTIVITY
- show_activity(1);
-#endif
if (arp_timeout_check() > 0)
time_start = get_timer(0);
if (arp_timeout_check() > 0)
time_start = get_timer(0);
@@
-1628,15
+1625,3
@@
ushort env_get_vlan(char *var)
{
return string_to_vlan(env_get(var));
}
{
return string_to_vlan(env_get(var));
}
-
-void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr)
-{
- char *end;
- int i;
-
- for (i = 0; i < 6; ++i) {
- enetaddr[i] = addr ? simple_strtoul(addr, &end, 16) : 0;
- if (addr)
- addr = (*end) ? end + 1 : end;
- }
-}