Added fdt_fixup_stdout that uses aliases to set linux,stdout-path

[karo-tx-uboot.git] / common / env_common.c

diff --git a/common/env_common.c b/common/env_common.c
index d46f24f603a421d7723bc70f4da7989c53e0935a..a49481244e2f7ae3c64c1829201161edee3436a1 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -30,12 +30,7 @@
 #include <linux/stddef.h>
 #include <malloc.h>
 
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
+DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_AMIGAONEG3SE
        extern void enable_nvram(void);
@@ -94,6 +89,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 +134,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)
 {
@@ -144,7 +145,6 @@ void env_crc_update (void)
 
 static uchar env_get_char_init (int index)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        uchar c;
 
        /* if crc was bad, use the default environment */
@@ -161,7 +161,6 @@ static uchar env_get_char_init (int index)
 #ifdef CONFIG_AMIGAONEG3SE
 uchar env_get_char_memory (int index)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        uchar retval;
        enable_nvram();
        if (gd->env_valid) {
@@ -175,8 +174,6 @@ uchar env_get_char_memory (int index)
 #else
 uchar env_get_char_memory (int index)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        if (gd->env_valid) {
                return ( *((uchar *)(gd->env_addr + index)) );
        } else {
@@ -187,8 +184,6 @@ uchar env_get_char_memory (int index)
 
 uchar *env_get_addr (int index)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        if (gd->env_valid) {
                return ( ((uchar *)(gd->env_addr + index)) );
        } else {
@@ -198,8 +193,6 @@ uchar *env_get_addr (int index)
 
 void env_relocate (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        DEBUGF ("%s[%d] offset = 0x%lx\n", __FUNCTION__,__LINE__,
                gd->reloc_off);
 
@@ -232,7 +225,7 @@ void env_relocate (void)
                puts ("Using default environment\n\n");
 #else
                puts ("*** Warning - bad CRC, using default environment\n\n");
-               SHOW_BOOT_PROGRESS (-1);
+               show_boot_progress (-60);
 #endif
 
                if (sizeof(default_environment) > ENV_SIZE)
@@ -277,7 +270,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;