Revert "mkimage: update man page and -h output"

This is part of a longer series, which isn't quite ready.  Revert this
for now at least.

This reverts commit 4cb6c8e5f0de3c4c5f9eba51c6a1610934a8cf77.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/doc/mkimage.1 b/doc/mkimage.1
index c1903896f3d12f13dabe280584cf739f47d0393e..d0a038a880ab1e05ff691d2528046ae8ef1b6ad9 100644 (file)
--- a/doc/mkimage.1
+++ b/doc/mkimage.1
@@ -281,10 +281,8 @@ properties.  A \(oqdata-offset\(cq of 0 indicates that it starts in the first
 .BI \-B " alignment"
 .TQ
 .BI \-\-alignment " alignment"
-The alignment, in hexadecimal, that the FDT structure will be aligned
-to. With
-.BR \-E ,
-also specifies the alignment for the external data.
+The alignment, in hexadecimal, that external data will be aligned to. This
+option only has an effect when \-E is specified.
 .
 .TP
 .BI \-p " external-position"

diff --git a/tools/mkimage.c b/tools/mkimage.c
index a5979fa6fd79f19d7dec6621f84d46b62ddb19ff..6dfe3e1d42d902cba9a39995c53289183a67076b 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -112,7 +112,7 @@ static void usage(const char *msg)
                "          -f => input filename for FIT source\n"
                "          -i => input filename for ramdisk file\n"
                "          -E => place data outside of the FIT structure\n"
-               "          -B => align size in hex for FIT structure and, with -E, for the external data\n"
+               "          -B => align size in hex for FIT structure and header\n"
                "          -b => append the device tree binary to the FIT\n"
                "          -t => update the timestamp in the FIT\n");
 #ifdef CONFIG_FIT_SIGNATURE