GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 17:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootvx: Exit if bootline address is not specified

Browse source 
Exit the 'bootvx' command if bootline address is not specified.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Bin Meng 2018-04-11 22:02:21 -07:00
parent 7824ad6ad4
commit ced71a2f72
1 changed files with 61 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
cmd/elf.c
View file

@ -304,76 +304,73 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
tmp = env_get("bootaddr"); tmp = env_get("bootaddr");
if (!tmp) { if (!tmp) {
printf("## VxWorks bootline address not specified\n"); printf("## VxWorks bootline address not specified\n");
} else { return 1;
bootaddr = simple_strtoul(tmp, NULL, 16); }
/* 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) * Check to see if the bootline is defined in the 'bootargs' parameter.
ptr += sprintf(build_buf + ptr, * If it is not defined, we may be able to construct the info.
"host:%s ", tmp); */
else bootline = env_get("bootargs");
ptr += sprintf(build_buf + ptr, if (!bootline) {
"host:vxWorks "); tmp = env_get("bootdev");
if (tmp) {
/* strcpy(build_buf, tmp);
* The following parameters are only needed if 'bootdev' ptr = strlen(tmp);
* is an ethernet device, otherwise they are optional. } else {
*/ printf("## VxWorks boot device not specified\n");
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, tmp = env_get("bootfile");
max(strlen(bootline), (size_t)255)); if (tmp)
flush_cache(bootaddr, max(strlen(bootline), (size_t)255)); ptr += sprintf(build_buf + ptr, "host:%s ", tmp);
printf("## Using bootline (@ 0x%lx): %s\n", bootaddr, else
(char *)bootaddr); 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 #ifdef CONFIG_X86
/* /*
* Get VxWorks's physical memory base address from environment, * Get VxWorks's physical memory base address from environment,