[U-Boot] [PATCH] Make getenv_IPaddr() global

[U-Boot] [PATCH] Make getenv_IPaddr() global

[Dirk Behme]

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>

---

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.

 lib_generic/Makefile    |    1 
 lib_generic/net_utils.c |   57 ++++++++++++++++++++++++++++++++++++++++++++++++
 net/net.c               |   26 ---------------------
 3 files changed, 58 insertions(+), 26 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,57 @@
+/*
+ * 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>
+#include <net.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));
+}
+
+IPaddr_t getenv_IPaddr (char *var)
+{
+	return (string_to_ip(getenv(var)));
+}
+
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)));

[U-Boot] [PATCH] Make getenv_IPaddr() global

[Ben Warren]

Hi Dirk,

On Wed, Dec 30, 2009 at 6:36 AM, Dirk Behme <dirk.behme@googlemail.com>wrote:

> 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>
>
> ---
>
> 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.
>
>  lib_generic/Makefile    |    1
>  lib_generic/net_utils.c |   57
> ++++++++++++++++++++++++++++++++++++++++++++++++
>  net/net.c               |   26 ---------------------
>  3 files changed, 58 insertions(+), 26 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
>

I agree that this function should be generic, but it's more of an
environment function than a networking one.  Why not put this somewhere like
common/env_common.c or create a new file called common/env_net.c?

regards,
Ben

[U-Boot] [PATCH] Make getenv_IPaddr() global

[Dirk Behme]

On 30.12.2009 22:31, Ben Warren wrote:
> Hi Dirk,
>
> On Wed, Dec 30, 2009 at 6:36 AM, Dirk Behme<dirk.behme@googlemail.com>wrote:
>
>> 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>
>>
>> ---
>>
>> 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.
>>
>>   lib_generic/Makefile    |    1
>>   lib_generic/net_utils.c |   57
>> ++++++++++++++++++++++++++++++++++++++++++++++++
>>   net/net.c               |   26 ---------------------
>>   3 files changed, 58 insertions(+), 26 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
>>
>
> I agree that this function should be generic, but it's more of an
> environment function than a networking one.  Why not put this somewhere like
> common/env_common.c or create a new file called common/env_net.c?

Because Wolfgang proposed lib_generic/net_utils.c

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

I don't care where to put it, please discuss this with Wolfgang ;)

Best regards

Dirk

[U-Boot] [PATCH] Make getenv_IPaddr() global

[Wolfgang Denk]

Dear Ben,

In message <f8328f7c0912301331m7ae655c0ke6891526776cf0c3@mail.gmail.com> you wrote:
>
> > 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'
...

> I agree that this function should be generic, but it's more of an
> environment function than a networking one.  Why not put this somewhere like
> common/env_common.c or create a new file called common/env_net.c?

After re-thinking what I wrote before, I still think that lib_generic/
is the right place. The code defines two functions:

	IPaddr_t string_to_ip(char *s)
and
	IPaddr_t getenv_IPaddr (char *var)

The former does all the actual work and has nothing to do with
environment things, and the latter should eventually be moved as a
"static inline" to some header file.

I'm not sure how to interpret your comment - was it just a question,
or was it intended to be a NAK ?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
An expert is a person who avoids the small errors while  sweeping  on
to the grand fallacy.

[U-Boot] [PATCH] Make getenv_IPaddr() global

[Ben Warren]

Hi Wolfgang and Happy New Year to all,

On Sat, Jan 2, 2010 at 3:50 PM, Wolfgang Denk <wd@denx.de> wrote:

> Dear Ben,
>
> In message <f8328f7c0912301331m7ae655c0ke6891526776cf0c3@mail.gmail.com>
> you wrote:
> >
> > > 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'
> ...
>
> > I agree that this function should be generic, but it's more of an
> > environment function than a networking one.  Why not put this somewhere
> like
> > common/env_common.c or create a new file called common/env_net.c?
>
> After re-thinking what I wrote before, I still think that lib_generic/
> is the right place. The code defines two functions:
>
>        IPaddr_t string_to_ip(char *s)
> and
>         IPaddr_t getenv_IPaddr (char *var)
>
> The former does all the actual work and has nothing to do with
> environment things, and the latter should eventually be moved as a
> "static inline" to some header file.
>
> I'm not sure how to interpret your comment - was it just a question,
> or was it intended to be a NAK ?
>
> Not a firm NAK, I'm just not a fan of creating a new file for a single
function.  The important thing is that the code gets linked in to
everything, and both solutions fit that requirement.

> Best regards,
>
> Wolfgang Denk
>
> regards,
Ben