commit bd7925e39ebd514fedfc7f2187039db2d5194e7b
author David Brown <david.brown@linaro.org> Mon Jul 29 11:11:32 2019 -0600
committer David Brown <davidb@davidb.org> Wed Jul 31 09:59:38 2019 -0500
tree 73292340a0f812e6b4494b8036a89a777bc45f10
parent 3901d32eadc30976c2889c1e9d51d507355ec8bd

image: use explitic padding on dependency version

This struct currently relies on padding being done by the C compiler.
Although this is generally done the same across targets, this isn't
required, and it is better to make any padding explicit.  This also
makes it clear that there is extra space in this structure that can be
used for another purpose.

The python imgtool is also fixed to match.  It was using a 32-bit int,
which only worked in the little endian case.

Signed-off-by: David Brown <david.brown@linaro.org>

scripts/imgtool/image.py

diff --git a/scripts/imgtool/image.py b/scripts/imgtool/image.py
index 9bb4801..251aa9a 100644
--- a/scripts/imgtool/image.py
+++ b/scripts/imgtool/image.py
@@ -202,7 +202,7 @@
             for i in range(dependencies_num):
                 e = STRUCT_ENDIAN_DICT[self.endian]
                 payload = struct.pack(
-                                e + 'I'+'BBHI',
+                                e + 'B3x'+'BBHI',
                                 int(dependencies[DEP_IMAGES_KEY][i]),
                                 dependencies[DEP_VERSIONS_KEY][i].major,
                                 dependencies[DEP_VERSIONS_KEY][i].minor,