public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2] Make getenv_IPaddr() global
@ 2010-01-03  7:33 Dirk Behme
  2010-01-07 18:31 ` Ben Warren
  2010-01-17 19:15 ` Wolfgang Denk
  0 siblings, 2 replies; 4+ messages in thread
From: Dirk Behme @ 2010-01-03  7:33 UTC (permalink / raw)
  To: u-boot

There are boards out there that do not have network support in
U-Boot (CONFIG_CMD_NET not set), but they do so in Linux. This
makes it desirable to be able to port network configuration (like
the IP address) to the Linux kernel.

We should not make the passing of the IP configuration to Linux
dependent on U-Boot features / settings.

For this, make getenv_IPaddr() global. This fixes build error

u-boot/lib_xxx/board.c:360: undefined reference to `getenv_IPaddr'

on various architectures.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>

---

Changes in v2:

- Move getenv_IPaddr() to common header file and make it static inline

This makes other patches trying to fix this issue obsolete. E.g.

http://lists.denx.de/pipermail/u-boot/2009-December/065809.html
http://lists.denx.de/pipermail/u-boot/2009-December/065810.html
http://lists.denx.de/pipermail/u-boot/2009-December/065822.html

See

http://lists.denx.de/pipermail/u-boot/2009-December/065833.html
http://lists.denx.de/pipermail/u-boot/2009-December/065847.html
http://lists.denx.de/pipermail/u-boot/2009-December/065848.html

for further details.

 include/common.h        |    7 ++++++
 include/net.h           |    3 --
 lib_generic/Makefile    |    1 
 lib_generic/net_utils.c |   50 ++++++++++++++++++++++++++++++++++++++++++++++++
 net/net.c               |   26 ------------------------
 5 files changed, 58 insertions(+), 29 deletions(-)

Index: u-boot-main/lib_generic/Makefile
===================================================================
--- u-boot-main.orig/lib_generic/Makefile
+++ u-boot-main/lib_generic/Makefile
@@ -41,6 +41,7 @@ COBJS-y += gunzip.o
 COBJS-y += lmb.o
 COBJS-y += ldiv.o
 COBJS-$(CONFIG_MD5) += md5.o
+COBJS-y += net_utils.o
 COBJS-y += sha1.o
 COBJS-$(CONFIG_SHA256) += sha256.o
 COBJS-y += string.o
Index: u-boot-main/lib_generic/net_utils.c
===================================================================
--- /dev/null
+++ u-boot-main/lib_generic/net_utils.c
@@ -0,0 +1,50 @@
+/*
+ * Generic network code. Moved from net.c
+ *
+ * Copyright 1994 - 2000 Neil Russell.
+ * Copyright 2000 Roland Borde
+ * Copyright 2000 Paolo Scaffardi
+ * Copyright 2000-2002 Wolfgang Denk, wd at denx.de
+ * Copyright 2009 Dirk Behme, dirk.behme at googlemail.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+
+IPaddr_t string_to_ip(char *s)
+{
+	IPaddr_t addr;
+	char *e;
+	int i;
+
+	if (s == NULL)
+		return(0);
+
+	for (addr=0, i=0; i<4; ++i) {
+		ulong val = s ? simple_strtoul(s, &e, 10) : 0;
+		addr <<= 8;
+		addr |= (val & 0xFF);
+		if (s) {
+			s = (*e) ? e+1 : e;
+		}
+	}
+
+	return (htonl(addr));
+}
Index: u-boot-main/net/net.c
===================================================================
--- u-boot-main.orig/net/net.c
+++ u-boot-main/net/net.c
@@ -1890,27 +1890,6 @@ void ip_to_string (IPaddr_t x, char *s)
 	);
 }
 
-IPaddr_t string_to_ip(char *s)
-{
-	IPaddr_t addr;
-	char *e;
-	int i;
-
-	if (s == NULL)
-		return(0);
-
-	for (addr=0, i=0; i<4; ++i) {
-		ulong val = s ? simple_strtoul(s, &e, 10) : 0;
-		addr <<= 8;
-		addr |= (val & 0xFF);
-		if (s) {
-			s = (*e) ? e+1 : e;
-		}
-	}
-
-	return (htonl(addr));
-}
-
 void VLAN_to_string(ushort x, char *s)
 {
 	x = ntohs(x);
@@ -1939,11 +1918,6 @@ ushort string_to_VLAN(char *s)
 	return htons(id);
 }
 
-IPaddr_t getenv_IPaddr (char *var)
-{
-	return (string_to_ip(getenv(var)));
-}
-
 ushort getenv_VLAN(char *var)
 {
 	return (string_to_VLAN(getenv(var)));
Index: u-boot-main/include/common.h
===================================================================
--- u-boot-main.orig/include/common.h
+++ u-boot-main/include/common.h
@@ -617,6 +617,13 @@ int gunzip(void *, int, unsigned char *,
 int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
 						int stoponerr, int offset);
 
+/* lib_generic/net_utils.c */
+#include <net.h>
+static inline IPaddr_t getenv_IPaddr (char *var)
+{
+	return (string_to_ip(getenv(var)));
+}
+
 /* lib_generic/time.c */
 void	udelay        (unsigned long);
 
Index: u-boot-main/include/net.h
===================================================================
--- u-boot-main.orig/include/net.h
+++ u-boot-main/include/net.h
@@ -508,9 +508,6 @@ extern void	VLAN_to_string (ushort x, ch
 /* Convert a string to a vlan id */
 extern ushort string_to_VLAN(char *s);
 
-/* read an IP address from a environment variable */
-extern IPaddr_t getenv_IPaddr (char *);
-
 /* read a VLAN id from an environment variable */
 extern ushort getenv_VLAN(char *);
 

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-01-17 19:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-03  7:33 [U-Boot] [PATCH v2] Make getenv_IPaddr() global Dirk Behme
2010-01-07 18:31 ` Ben Warren
2010-01-16  6:46   ` Dirk Behme
2010-01-17 19:15 ` Wolfgang Denk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox