From 361a879902a3cbdb692149a1ac580e3199e771ba Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 9 Dec 2016 07:56:54 -0500 Subject: Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze" This reverts commit 3edc0c252257e4afed163a3a74aba24a5509b198, reversing changes made to bb135a0180c31fbd7456021fb9700b49bba7f533. --- tools/zynqimage.c | 16 +++------------- tools/zynqmpimage.c | 14 +++++--------- 2 files changed, 8 insertions(+), 22 deletions(-) (limited to 'tools') diff --git a/tools/zynqimage.c b/tools/zynqimage.c index b47132b..43876e7 100644 --- a/tools/zynqimage.c +++ b/tools/zynqimage.c @@ -225,26 +225,16 @@ static int zynqimage_check_image_types(uint8_t type) static void zynqimage_parse_initparams(struct zynq_header *zynqhdr, const char *filename) { - FILE *fp; + /* Expect a table of register-value pairs, e.g. "0x12345678 0x4321" */ + FILE *fp = fopen(filename, "r"); struct zynq_reginit reginit; unsigned int reg_count = 0; - int r, err; - struct stat path_stat; + int r; - /* Expect a table of register-value pairs, e.g. "0x12345678 0x4321" */ - fp = fopen(filename, "r"); if (!fp) { fprintf(stderr, "Cannot open initparams file: %s\n", filename); exit(1); } - - err = fstat(fileno(fp), &path_stat); - if (err) - return; - - if (!S_ISREG(path_stat.st_mode)) - return; - do { r = fscanf(fp, "%x %x", ®init.address, ®init.data); if (r == 2) { diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c index 60d8ed2..202faea 100644 --- a/tools/zynqmpimage.c +++ b/tools/zynqmpimage.c @@ -240,23 +240,19 @@ static void zynqmpimage_parse_initparams(struct zynqmp_header *zynqhdr, FILE *fp; struct zynqmp_reginit reginit; unsigned int reg_count = 0; - int r, err; + 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) { fprintf(stderr, "Cannot open initparams file: %s\n", filename); exit(1); } - - err = fstat(fileno(fp), &path_stat); - if (err) - return; - - if (!S_ISREG(path_stat.st_mode)) - return; - do { r = fscanf(fp, "%x %x", ®init.address, ®init.data); if (r == 2) { -- cgit v1.1