summaryrefslogtreecommitdiff
path: root/tools/zynqimage.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-12-09 07:56:54 -0500
committerTom Rini <trini@konsulko.com>2016-12-09 07:56:54 -0500
commit361a879902a3cbdb692149a1ac580e3199e771ba (patch)
tree22d8f65bdf2e41096d13f2bfd458fb25b3c3698d /tools/zynqimage.c
parent3edc0c252257e4afed163a3a74aba24a5509b198 (diff)
downloadu-boot-imx-361a879902a3cbdb692149a1ac580e3199e771ba.zip
u-boot-imx-361a879902a3cbdb692149a1ac580e3199e771ba.tar.gz
u-boot-imx-361a879902a3cbdb692149a1ac580e3199e771ba.tar.bz2
Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"
This reverts commit 3edc0c252257e4afed163a3a74aba24a5509b198, reversing changes made to bb135a0180c31fbd7456021fb9700b49bba7f533.
Diffstat (limited to 'tools/zynqimage.c')
-rw-r--r--tools/zynqimage.c16
1 files changed, 3 insertions, 13 deletions
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", &reginit.address, &reginit.data);
if (r == 2) {