Fixes while testing.

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index bca13ca7f5951699ab94bc3589265e727b33d091..0d79cd74a31b0145182d51f808e11cd3d74fef61 100644 (file)
--- 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 9d97d889362acb14841e626a346c98c48c04b821..f7f268e7b0395d17d2f653a4af017d927a6e6a35 100644 (file)
--- 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 ebc527d19d9f2bbe02b8cf4223a260b5fd64935e..8475c76abd9a4efdcd0dc2526d7db0e8170b7ce9 100644 (file)
--- 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"