qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: plbimage support generate rcw file 

some system will not generate pbl format u-boot, but require rcw.

Signed-off-by: yuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Reviewed-by: Alison Wang <alison.wang@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
yuan linyu 2017-02-26 08:38:27 +08:00 committed by York Sun
parent dd48f0bfb5
commit 33ed57495a
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tools/pblimage.c
View File

@ -194,17 +194,20 @@ void pbl_load_uboot(int ifd, struct image_tool_params *params)
pbl_parser(params->imagename); pbl_parser(params->imagename);
/* parse the pbi.cfg file. */ /* parse the pbi.cfg file. */
pbl_parser(params->imagename2); if (params->imagename2[0] != '\0')
pbl_parser(params->imagename2);
fp_uboot = fopen(params->datafile, "r"); if (params->datafile) {
if (fp_uboot == NULL) { fp_uboot = fopen(params->datafile, "r");
printf("Error: %s open failed\n", params->datafile); if (fp_uboot == NULL) {
exit(EXIT_FAILURE); printf("Error: %s open failed\n", params->datafile);
exit(EXIT_FAILURE);
}
load_uboot(fp_uboot);
fclose(fp_uboot);
} }
load_uboot(fp_uboot);
add_end_cmd(); add_end_cmd();
fclose(fp_uboot);
lseek(ifd, 0, SEEK_SET); lseek(ifd, 0, SEEK_SET);
size = pbl_size; size = pbl_size;
@ -265,21 +268,24 @@ int pblimage_check_params(struct image_tool_params *params)
if (!params) if (!params)
return EXIT_FAILURE; return EXIT_FAILURE;
fp_uboot = fopen(params->datafile, "r"); if (params->datafile) {
if (fp_uboot == NULL) { fp_uboot = fopen(params->datafile, "r");
printf("Error: %s open failed\n", params->datafile); if (fp_uboot == NULL) {
exit(EXIT_FAILURE); printf("Error: %s open failed\n", params->datafile);
} exit(EXIT_FAILURE);
fd = fileno(fp_uboot); }
fd = fileno(fp_uboot);
if (fstat(fd, &st) == -1) { if (fstat(fd, &st) == -1) {
printf("Error: Could not determine u-boot image size. %s\n", printf("Error: Could not determine u-boot image size. %s\n",
strerror(errno)); strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* For the variable size, we need to pad it to 64 byte boundary */ /* For the variable size, pad it to 64 byte boundary */
uboot_size = roundup(st.st_size, 64); uboot_size = roundup(st.st_size, 64);
fclose(fp_uboot);
}
if (params->arch == IH_ARCH_ARM) { if (params->arch == IH_ARCH_ARM) {
arch_flag = IH_ARCH_ARM; arch_flag = IH_ARCH_ARM;