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

[u-boot] / cmd / elf.c

diff --git a/cmd/elf.c b/cmd/elf.c
index 407d136a034f1e68d65211369f3935481d751ac5..eafea38aed18938621ecafa4a5d3da0a13322046 100644 (file)
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -246,7 +246,7 @@ int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned long addr; /* Address of image */
-       unsigned long bootaddr; /* Address to put the bootline */
+       unsigned long bootaddr = 0; /* Address to put the bootline */
        char *bootline; /* Text of the bootline */
        char *tmp; /* Temporary char pointer */
        char build_buf[128]; /* Buffer for building the bootline */
@@ -295,85 +295,6 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        puts("## Ethernet MAC address not copied to NV RAM\n");
 #endif
 
-       /*
-        * Use bootaddr to find the location in memory that VxWorks
-        * will look for the bootline string. The default value is
-        * (LOCAL_MEM_LOCAL_ADRS + BOOT_LINE_OFFSET) as defined by
-        * VxWorks BSP. For example, on PowerPC it defaults to 0x4200.
-        */
-       tmp = env_get("bootaddr");
-       if (!tmp) {
-               printf("## VxWorks bootline address not specified\n");
-       } else {
-               bootaddr = simple_strtoul(tmp, NULL, 16);
-
-               /*
-                * Check to see if the bootline is defined in the 'bootargs'
-                * parameter. If it is not defined, we may be able to
-                * construct the info.
-                */
-               bootline = env_get("bootargs");
-               if (!bootline) {
-                       tmp = env_get("bootdev");
-                       if (tmp) {
-                               strcpy(build_buf, tmp);
-                               ptr = strlen(tmp);
-                       } else
-                               printf("## VxWorks boot device not specified\n");
-
-                       tmp = env_get("bootfile");
-                       if (tmp)
-                               ptr += sprintf(build_buf + ptr,
-                                              "host:%s ", tmp);
-                       else
-                               ptr += sprintf(build_buf + ptr,
-                                              "host:vxWorks ");
-
-                       /*
-                        * The following parameters are only needed if 'bootdev'
-                        * is an ethernet device, otherwise they are optional.
-                        */
-                       tmp = env_get("ipaddr");
-                       if (tmp) {
-                               ptr += sprintf(build_buf + ptr, "e=%s", tmp);
-                               tmp = env_get("netmask");
-                               if (tmp) {
-                                       u32 mask = env_get_ip("netmask").s_addr;
-                                       ptr += sprintf(build_buf + ptr,
-                                                      ":%08x ", ntohl(mask));
-                               } else {
-                                       ptr += sprintf(build_buf + ptr, " ");
-                               }
-                       }
-
-                       tmp = env_get("serverip");
-                       if (tmp)
-                               ptr += sprintf(build_buf + ptr, "h=%s ", tmp);
-
-                       tmp = env_get("gatewayip");
-                       if (tmp)
-                               ptr += sprintf(build_buf + ptr, "g=%s ", tmp);
-
-                       tmp = env_get("hostname");
-                       if (tmp)
-                               ptr += sprintf(build_buf + ptr, "tn=%s ", tmp);
-
-                       tmp = env_get("othbootargs");
-                       if (tmp) {
-                               strcpy(build_buf + ptr, tmp);
-                               ptr += strlen(tmp);
-                       }
-
-                       bootline = build_buf;
-               }
-
-               memcpy((void *)bootaddr, bootline,
-                      max(strlen(bootline), (size_t)255));
-               flush_cache(bootaddr, max(strlen(bootline), (size_t)255));
-               printf("## Using bootline (@ 0x%lx): %s\n", bootaddr,
-                      (char *)bootaddr);
-       }
-
 #ifdef CONFIG_X86
        /*
         * Get VxWorks's physical memory base address from environment,
@@ -413,6 +334,87 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        }
 #endif
 
+       /*
+        * Use bootaddr to find the location in memory that VxWorks
+        * will look for the bootline string. The default value is
+        * (LOCAL_MEM_LOCAL_ADRS + BOOT_LINE_OFFSET) as defined by
+        * VxWorks BSP. For example, on PowerPC it defaults to 0x4200.
+        */
+       tmp = env_get("bootaddr");
+       if (!tmp) {
+#ifdef CONFIG_X86
+               bootaddr = base + X86_BOOT_LINE_OFFSET;
+#else
+               printf("## VxWorks bootline address not specified\n");
+               return 1;
+#endif
+       }
+
+       if (!bootaddr)
+               bootaddr = simple_strtoul(tmp, NULL, 16);
+
+       /*
+        * Check to see if the bootline is defined in the 'bootargs' parameter.
+        * If it is not defined, we may be able to construct the info.
+        */
+       bootline = env_get("bootargs");
+       if (!bootline) {
+               tmp = env_get("bootdev");
+               if (tmp) {
+                       strcpy(build_buf, tmp);
+                       ptr = strlen(tmp);
+               } else {
+                       printf("## VxWorks boot device not specified\n");
+               }
+
+               tmp = env_get("bootfile");
+               if (tmp)
+                       ptr += sprintf(build_buf + ptr, "host:%s ", tmp);
+               else
+                       ptr += sprintf(build_buf + ptr, "host:vxWorks ");
+
+               /*
+                * The following parameters are only needed if 'bootdev'
+                * is an ethernet device, otherwise they are optional.
+                */
+               tmp = env_get("ipaddr");
+               if (tmp) {
+                       ptr += sprintf(build_buf + ptr, "e=%s", tmp);
+                       tmp = env_get("netmask");
+                       if (tmp) {
+                               u32 mask = env_get_ip("netmask").s_addr;
+                               ptr += sprintf(build_buf + ptr,
+                                              ":%08x ", ntohl(mask));
+                       } else {
+                               ptr += sprintf(build_buf + ptr, " ");
+                       }
+               }
+
+               tmp = env_get("serverip");
+               if (tmp)
+                       ptr += sprintf(build_buf + ptr, "h=%s ", tmp);
+
+               tmp = env_get("gatewayip");
+               if (tmp)
+                       ptr += sprintf(build_buf + ptr, "g=%s ", tmp);
+
+               tmp = env_get("hostname");
+               if (tmp)
+                       ptr += sprintf(build_buf + ptr, "tn=%s ", tmp);
+
+               tmp = env_get("othbootargs");
+               if (tmp) {
+                       strcpy(build_buf + ptr, tmp);
+                       ptr += strlen(tmp);
+               }
+
+               bootline = build_buf;
+       }
+
+       memcpy((void *)bootaddr, bootline, max(strlen(bootline), (size_t)255));
+       flush_cache(bootaddr, max(strlen(bootline), (size_t)255));
+       printf("## Using bootline (@ 0x%lx): %s\n", bootaddr, (char *)bootaddr);
+
        /*
         * If the data at the load address is an elf image, then
         * treat it like an elf image. Otherwise, assume that it is a