fdtgrep: Correct alignment of struct section

When outputting a devicetree we should not align the struct section to a
16-byte boundary. The normal position is fine, which is 8-byte aligned.

This avoids leaving adding 8 extra zero bytes in the output tree in the
case where the reserved section is empty (i.e has 16 zero bytes).

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
index db51246..641d6a2 100644 (file)
--- a/tools/fdtgrep.c
+++ b/tools/fdtgrep.c
@@ -438,8 +438,7 @@ static int dump_fdt_regions(struct display_info *disp, const void *blob,
        fdt = (struct fdt_header *)out;
        memset(fdt, '\0', sizeof(*fdt));
        fdt_set_magic(fdt, FDT_MAGIC);
-       struct_start = FDT_ALIGN(sizeof(struct fdt_header),
-                                       sizeof(struct fdt_reserve_entry));
+       struct_start = sizeof(struct fdt_header);
        fdt_set_off_mem_rsvmap(fdt, struct_start);
        fdt_set_version(fdt, FDT_LAST_SUPPORTED_VERSION);
        fdt_set_last_comp_version(fdt, FDT_FIRST_SUPPORTED_VERSION);