[U-Boot-Users] [PATCH v2] mx31ads: fix loadaddr environment variable define

[Guennadi Liakhovetski]

Arithmetic expressions do not get evaluated under stringification. Remove 
default network configuration, add DHCP command support. Thanks to Felix 
Radensky for reporting.

Signed-off-by: Guennadi Liakhovetski <lg at denx.de>

---

On Sun, 27 Apr 2008, Wolfgang Denk wrote:

> In message <Pine.LNX.4.64.0804272210370.6246 at axis700.grange> you wrote:
> >
> > > 2. dhcp command is undefined, only bootp is available.
> > 
> > It wasn't needed in the environment the configuration has been programmed 
> > for. Patches are welcome:-)
> 
> Please add it. It's default...

Hm, but it isn't in

#include <config_cmd_default.h>

?

> > diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
> > index 5286e1f..301afd5 100644
> > --- a/include/configs/mx31ads.h
> > +++ b/include/configs/mx31ads.h
> > @@ -87,7 +87,7 @@
> >  #define CONFIG_NETMASK		255.255.255.0
> >  #define CONFIG_IPADDR		192.168.23.168
> >  #define CONFIG_SERVERIP		192.168.23.2
> > -#define CONFIG_LOADADDR		(CSD0_BASE + 0x800000)	/* loadaddr env var */
> > +#define CONFIG_LOADADDR		0x80800000	/* loadaddr env var */
> 
> And while we are at it: Please remove all these default network
> settings. I don't like these at all.

Is this one better?

diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 5286e1f..7614b95 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -79,15 +79,13 @@
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_PING
+#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_DATE
 
 #define CONFIG_BOOTDELAY	3
 
-#define CONFIG_NETMASK		255.255.255.0
-#define CONFIG_IPADDR		192.168.23.168
-#define CONFIG_SERVERIP		192.168.23.2
-#define CONFIG_LOADADDR		(CSD0_BASE + 0x800000)	/* loadaddr env var */
+#define CONFIG_LOADADDR		0x80800000	/* loadaddr env var */
 
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\