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

[u-boot] / common / env_common.c

diff --git a/common/env_common.c b/common/env_common.c
index c3e6388ac0b2379f48f5344c62a5bcf67db88377..d9e990dbbec92c9eb6f8b4e28194e1e6ee6d1856 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -34,20 +34,13 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern env_t *env_ptr;
-
-extern void env_relocate_spec (void);
-extern uchar env_get_char_spec(int);
-
-static uchar env_get_char_init (int index);
-
 /************************************************************************
  * Default settings to be used when no valid environment is found
  */
 #define XMK_STR(x)     #x
 #define MK_STR(x)      XMK_STR(x)
 
-uchar default_environment[] = {
+const uchar default_environment[] = {
 #ifdef CONFIG_BOOTARGS
        "bootargs="     CONFIG_BOOTARGS                 "\0"
 #endif
@@ -94,13 +87,13 @@ uchar default_environment[] = {
        "serverip="     MK_STR(CONFIG_SERVERIP)         "\0"
 #endif
 #ifdef CONFIG_SYS_AUTOLOAD
-       "autoload="     CONFIG_SYS_AUTOLOAD                     "\0"
+       "autoload="     CONFIG_SYS_AUTOLOAD             "\0"
 #endif
 #ifdef CONFIG_PREBOOT
        "preboot="      CONFIG_PREBOOT                  "\0"
 #endif
 #ifdef CONFIG_ROOTPATH
-       "rootpath="     MK_STR(CONFIG_ROOTPATH)         "\0"
+       "rootpath="     CONFIG_ROOTPATH                 "\0"
 #endif
 #ifdef CONFIG_GATEWAYIP
        "gatewayip="    MK_STR(CONFIG_GATEWAYIP)        "\0"
@@ -112,18 +105,29 @@ uchar default_environment[] = {
        "hostname="     MK_STR(CONFIG_HOSTNAME)         "\0"
 #endif
 #ifdef CONFIG_BOOTFILE
-       "bootfile="     MK_STR(CONFIG_BOOTFILE)         "\0"
+       "bootfile="     CONFIG_BOOTFILE                 "\0"
 #endif
 #ifdef CONFIG_LOADADDR
        "loadaddr="     MK_STR(CONFIG_LOADADDR)         "\0"
 #endif
-#ifdef  CONFIG_CLOCKS_IN_MHZ
+#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
+#ifdef CONFIG_ENV_VARS_UBOOT_CONFIG
+       "arch="         CONFIG_SYS_ARCH                 "\0"
+       "cpu="          CONFIG_SYS_CPU                  "\0"
+       "board="        CONFIG_SYS_BOARD                "\0"
+#ifdef CONFIG_SYS_VENDOR
+       "vendor="       CONFIG_SYS_VENDOR               "\0"
+#endif
+#ifdef CONFIG_SYS_SOC
+       "soc="          CONFIG_SYS_SOC                  "\0"
+#endif
+#endif
+#ifdef CONFIG_EXTRA_ENV_SETTINGS
        CONFIG_EXTRA_ENV_SETTINGS
 #endif
        "\0"
@@ -131,38 +135,37 @@ uchar default_environment[] = {
 
 struct hsearch_data env_htab;
 
-static uchar env_get_char_init (int index)
+static uchar __env_get_char_spec(int index)
 {
-       uchar c;
+       return *((uchar *)(gd->env_addr + index));
+}
+uchar env_get_char_spec(int)
+       __attribute__((weak, alias("__env_get_char_spec")));
 
+static uchar env_get_char_init(int index)
+{
        /* if crc was bad, use the default environment */
        if (gd->env_valid)
-               c = env_get_char_spec(index);
+               return env_get_char_spec(index);
        else
-               c = default_environment[index];
-
-       return (c);
+               return default_environment[index];
 }
 
-uchar env_get_char_memory (int index)
+uchar env_get_char_memory(int index)
 {
        return *env_get_addr(index);
 }
 
-uchar env_get_char (int index)
+uchar env_get_char(int index)
 {
-       uchar c;
-
        /* if relocated to RAM */
        if (gd->flags & GD_FLG_RELOC)
-               c = env_get_char_memory(index);
+               return env_get_char_memory(index);
        else
-               c = env_get_char_init(index);
-
-       return (c);
+               return env_get_char_init(index);
 }
 
-uchar *env_get_addr (int index)
+const uchar *env_get_addr(int index)
 {
        if (gd->env_valid)
                return (uchar *)(gd->env_addr + index);
@@ -181,7 +184,7 @@ void set_default_env(const char *s)
                if (*s == '!') {
                        printf("*** Warning - %s, "
                                "using default environment\n\n",
-                               s+1);
+                               s + 1);
                } else {
                        puts(s);
                }
@@ -190,9 +193,9 @@ void set_default_env(const char *s)
        }
 
        if (himport_r(&env_htab, (char *)default_environment,
-                   sizeof(default_environment), '\0', 0) == 0) {
+                       sizeof(default_environment), '\0', 0) == 0)
                error("Environment import failed: errno = %d\n", errno);
-       }
+
        gd->flags |= GD_FLG_ENV_READY;
 }
 
@@ -227,22 +230,20 @@ int env_import(const char *buf, int check)
        return 0;
 }
 
-void env_relocate (void)
+void env_relocate(void)
 {
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
-       extern void env_reloc(void);
-
        env_reloc();
 #endif
        if (gd->env_valid == 0) {
 #if defined(CONFIG_ENV_IS_NOWHERE)     /* Environment not changable */
                set_default_env(NULL);
 #else
-               show_boot_progress (-60);
+               bootstage_error(BOOTSTAGE_ID_NET_CHECKSUM);
                set_default_env("!bad CRC");
 #endif
        } else {
-               env_relocate_spec ();
+               env_relocate_spec();
        }
 }
 
@@ -272,6 +273,7 @@ int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf)
 
        if (idx)
                cmdv[found++] = "...";
+
        cmdv[found] = NULL;
        return found;
 }