Add command for handling DDR ECC registers on MPC8349EE MDS board.

[oweals/u-boot.git] / common / env_common.c

diff --git a/common/env_common.c b/common/env_common.c
index d46f24f603a421d7723bc70f4da7989c53e0935a..3201135ea2eddbe7b46c427c7f1deef21d9d7d32 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -94,6 +94,9 @@ uchar default_environment[] = {
 #ifdef CONFIG_ETH2ADDR
        "eth2addr="     MK_STR(CONFIG_ETH2ADDR)         "\0"
 #endif
+#ifdef CONFIG_ETH3ADDR
+       "eth3addr="     MK_STR(CONFIG_ETH3ADDR)         "\0"
+#endif
 #ifdef CONFIG_IPADDR
        "ipaddr="       MK_STR(CONFIG_IPADDR)           "\0"
 #endif
@@ -136,6 +139,9 @@ uchar default_environment[] = {
        "\0"
 };
 
+#if defined(CFG_ENV_IS_IN_NAND)                /* Environment is in Nand Flash */
+int default_environment_size = sizeof(default_environment);
+#endif
 
 void env_crc_update (void)
 {
@@ -277,7 +283,7 @@ int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf)
                for (nxt=i; env_get_char(nxt) != '\0'; ++nxt)
                        ;
 
-               lval = env_get_addr(i);
+               lval = (char *)env_get_addr(i);
                rval = strchr(lval, '=');
                if (rval != NULL) {
                        vallen = rval - lval;