From: wdenk <wdenk>
Date: Sat, 28 Sep 2002 19:19:44 +0000 (+0000)
Subject: Fixes while testing.
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=23e2db0da7c1699249ad36f5985e98b2da92276c;p=users%2Frw%2Fppcboot.git

Fixes while testing.
---

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index bca13ca..0d79cd7 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -330,7 +330,7 @@ int _do_setenv (int flag, int argc, char *argv[])
 	if (strcmp(argv[1],"ipaddr") == 0) {
 		char *s = argv[2];	/* always use only one arg */
 		char *e;
-		IPaddr_t addr;
+		unsigned long addr;
 		bd->bi_ip_addr = 0;
 		for (addr=0, i=0; i<4; ++i) {
 			ulong val = s ? simple_strtoul(s, &e, 10) : 0;
diff --git a/common/env_common.c b/common/env_common.c
index 9d97d88..f7f268e 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -218,7 +218,9 @@ void env_relocate (void)
 		memcpy (env_ptr->data,
 			default_environment,
 			sizeof(default_environment));
+#ifdef CFG_REDUNDAND_ENVIRONMENT
 		env_ptr->flags = 0xFF;
+#endif
 		env_crc_update ();
 		gd->env_valid = 1;
 	}
diff --git a/common/environment.c b/common/environment.c
index ebc527d..8475c76 100644
--- a/common/environment.c
+++ b/common/environment.c
@@ -93,7 +93,9 @@
 
 env_t environment __PPCENV__ = {
 	ENV_CRC,	/* CRC Sum */
+#ifdef CFG_REDUNDAND_ENVIRONMENT
 	1,		/* Flags: valid */
+#endif
 	{
 #if defined(CONFIG_BOOTARGS)
 	"bootargs="	CONFIG_BOOTARGS			"\0"