diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-07 23:42:33 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-07 23:42:33 +0100 |
| commit | 35e3717772c8c3534c18d8aac69e4b822777c23b (patch) | |
| tree | 9fa7a1e24f670772cc8d026a15d63ddf85a36810 /tools | |
| parent | 7cb5fc15f22de46cc6fabc26baf994cf8f7fa546 (diff) | |
| parent | 0fc52948bda0734431cb528ee4fd82f1dec8c7b5 (diff) | |
| download | talos-obmc-uboot-35e3717772c8c3534c18d8aac69e4b822777c23b.tar.gz talos-obmc-uboot-35e3717772c8c3534c18d8aac69e4b822777c23b.zip | |
Merge branch 'master' of ../work into next
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mkimage.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c index 6826eae771..1bed93360e 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -229,15 +229,13 @@ main (int argc, char **argv) case 'f': if (--argc <= 0) usage (); - params.type = IH_TYPE_FLATDT; - params.datafile = *++argv; - params.fflag = 1; - /* * The flattened image tree (FIT) format * requires a flattened device tree image type */ params.type = IH_TYPE_FLATDT; + params.datafile = *++argv; + params.fflag = 1; goto NXTARG; case 'n': if (--argc <= 0) |
