leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: mkimage: Check if file is regular file

Browse Source 
Current Makefile.spl passes -R parameter which is not empty
and pointing to ./ folder.
"./tools/mkimage -T zynqmpimage -R ./"" -d spl/u-boot-spl.bin
spl/boot.bin"
That's why mkimage is trying to parse ./ file and generate
register init which is wrong.
Check that passed filename is regular file. If not do not work with it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2016-10-21 13:16:13 +02:00
parent 3b6460809c
commit 56c7e80155
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/zynqmpimage.c
View File

@ -237,12 +237,18 @@ static int zynqmpimage_check_image_types(uint8_t type)
static void zynqmpimage_parse_initparams(struct zynqmp_header *zynqhdr, static void zynqmpimage_parse_initparams(struct zynqmp_header *zynqhdr,
const char *filename) const char *filename)
{ {
/* Expect a table of register-value pairs, e.g. "0x12345678 0x4321" */ FILE *fp;
FILE *fp = fopen(filename, "r");
struct zynqmp_reginit reginit; struct zynqmp_reginit reginit;
unsigned int reg_count = 0; unsigned int reg_count = 0;
int r; int r;
struct stat path_stat;
stat(filename, &path_stat);
if (!S_ISREG(path_stat.st_mode))
return;
/* Expect a table of register-value pairs, e.g. "0x12345678 0x4321" */
fp = fopen(filename, "r");
if (!fp) { if (!fp) {
fprintf(stderr, "Cannot open initparams file: %s\n", filename); fprintf(stderr, "Cannot open initparams file: %s\n", filename);
exit(1); exit(1);