Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

[platform/kernel/u-boot.git] / common / env_common.c

diff --git a/common/env_common.c b/common/env_common.c
index 4f618d6..e6df9a5 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -27,16 +27,10 @@
 #include <common.h>
 #include <command.h>
 #include <environment.h>
-#include <cmd_nvedit.h>
 #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);
@@ -95,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
@@ -128,12 +125,19 @@ uchar default_environment[] = {
 #ifdef  CONFIG_CLOCKS_IN_MHZ
        "clocks_in_mhz=1\0"
 #endif
+#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
+       "pcidelay="     MK_STR(CONFIG_PCI_BOOTDELAY)    "\0"
+#endif
 #ifdef  CONFIG_EXTRA_ENV_SETTINGS
        CONFIG_EXTRA_ENV_SETTINGS
 #endif
        "\0"
 };
 
+#if defined(CFG_ENV_IS_IN_NAND)                /* Environment is in Nand Flash */ \
+       || defined(CFG_ENV_IS_IN_SPI_FLASH)
+int default_environment_size = sizeof(default_environment);
+#endif
 
 void env_crc_update (void)
 {
@@ -142,7 +146,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 */
@@ -159,7 +162,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) {
@@ -173,8 +175,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 {
@@ -185,8 +185,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 {
@@ -196,8 +194,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);
 
@@ -230,7 +226,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)
@@ -258,3 +254,44 @@ void env_relocate (void)
        disable_nvram();
 #endif
 }
+
+#ifdef CONFIG_AUTO_COMPLETE
+int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf)
+{
+       int i, nxt, len, vallen, found;
+       const char *lval, *rval;
+
+       found = 0;
+       cmdv[0] = NULL;
+
+       len = strlen(var);
+       /* now iterate over the variables and select those that match */
+       for (i=0; env_get_char(i) != '\0'; i=nxt+1) {
+
+               for (nxt=i; env_get_char(nxt) != '\0'; ++nxt)
+                       ;
+
+               lval = (char *)env_get_addr(i);
+               rval = strchr(lval, '=');
+               if (rval != NULL) {
+                       vallen = rval - lval;
+                       rval++;
+               } else
+                       vallen = strlen(lval);
+
+               if (len > 0 && (vallen < len || memcmp(lval, var, len) != 0))
+                       continue;
+
+               if (found >= maxv - 2 || bufsz < vallen + 1) {
+                       cmdv[found++] = "...";
+                       break;
+               }
+               cmdv[found++] = buf;
+               memcpy(buf, lval, vallen); buf += vallen; bufsz -= vallen;
+               *buf++ = '\0'; bufsz--;
+       }
+
+       cmdv[found] = NULL;
+       return found;
+}
+#endif