Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-26 04:17:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

pxe_utils: Clean up {bootm,zboot}_argv generation

Browse source 
Signed-off-by: Zhaofeng Li <hello@zhaofeng.li>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Zhaofeng Li 2021-10-20 00:18:15 -07:00 • committed by Bin Meng
parent 23f3e399de
commit c97bd17b2c
1 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
cmd/pxe_utils.c
View file

@ -442,15 +442,17 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
{ {
char *bootm_argv[] = { "bootm", NULL, NULL, NULL, NULL }; char *bootm_argv[] = { "bootm", NULL, NULL, NULL, NULL };
char *zboot_argv[] = { "zboot", NULL, "0", NULL, NULL }; char *zboot_argv[] = { "zboot", NULL, "0", NULL, NULL };
char initrd_str[28]; char *kernel_addr = NULL;
char *initrd_addr_str = NULL;
char initrd_filesize[10]; char initrd_filesize[10];
char initrd_str[28];
char mac_str[29] = ""; char mac_str[29] = "";
char ip_str[68] = ""; char ip_str[68] = "";
char *fit_addr = NULL; char *fit_addr = NULL;
int bootm_argc = 2; int bootm_argc = 2;
int zboot_argc = 3; int zboot_argc = 3;
int len = 0; int len = 0;
ulong kernel_addr; ulong kernel_addr_r;
void *buf; void *buf;
label_print(label); label_print(label);
@ -476,16 +478,12 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
return 1; return 1;
} }
bootm_argv[2] = initrd_str; initrd_addr_str = env_get("ramdisk_addr_r");
strncpy(bootm_argv[2], env_get("ramdisk_addr_r"), 18);
strcat(bootm_argv[2], ":");
strncat(bootm_argv[2], env_get("filesize"), 9);
bootm_argc = 3;
strncpy(initrd_filesize, env_get("filesize"), 9); strncpy(initrd_filesize, env_get("filesize"), 9);
zboot_argv[3] = env_get("ramdisk_addr_r");
zboot_argv[4] = initrd_filesize; strncpy(initrd_str, initrd_addr_str, 18);
zboot_argc = 5; strcat(initrd_str, ":");
strncat(initrd_str, initrd_filesize, 9);
} }
if (get_relfile_envaddr(cmdtp, label->kernel, "kernel_addr_r") < 0) { if (get_relfile_envaddr(cmdtp, label->kernel, "kernel_addr_r") < 0) {
@ -536,20 +534,19 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
printf("append: %s\n", finalbootargs); printf("append: %s\n", finalbootargs);
} }
bootm_argv[1] = env_get("kernel_addr_r"); kernel_addr = env_get("kernel_addr_r");
zboot_argv[1] = env_get("kernel_addr_r");
/* for FIT, append the configuration identifier */ /* for FIT, append the configuration identifier */
if (label->config) { if (label->config) {
int len = strlen(bootm_argv[1]) + strlen(label->config) + 1; int len = strlen(kernel_addr) + strlen(label->config) + 1;
fit_addr = malloc(len); fit_addr = malloc(len);
if (!fit_addr) { if (!fit_addr) {
printf("malloc fail (FIT address)\n"); printf("malloc fail (FIT address)\n");
return 1; return 1;
} }
snprintf(fit_addr, len, "%s%s", bootm_argv[1], label->config); snprintf(fit_addr, len, "%s%s", kernel_addr, label->config);
bootm_argv[1] = fit_addr; kernel_addr = fit_addr;
} }
/* /*
@ -653,6 +650,18 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
} }
} }
bootm_argv[1] = kernel_addr;
zboot_argv[1] = kernel_addr;
if (initrd_addr_str) {
bootm_argv[2] = initrd_str;
bootm_argc = 3;
zboot_argv[3] = initrd_addr_str;
zboot_argv[4] = initrd_filesize;
zboot_argc = 5;
}
if (!bootm_argv[3]) if (!bootm_argv[3])
bootm_argv[3] = env_get("fdt_addr"); bootm_argv[3] = env_get("fdt_addr");
@ -662,8 +671,8 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
bootm_argc = 4; bootm_argc = 4;
} }
kernel_addr = genimg_get_kernel_addr(bootm_argv[1]); kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
buf = map_sysmem(kernel_addr, 0); buf = map_sysmem(kernel_addr_r, 0);
/* Try bootm for legacy and FIT format image */ /* Try bootm for legacy and FIT format image */
if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID) if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID)
do_bootm(cmdtp, 0, bootm_argc, bootm_argv); do_bootm(cmdtp, 0, bootm_argc, bootm_argv);