Merge branch '2020-03-12-rsa-improvements' into next

[oweals/u-boot.git] / tools / ifwitool.c

diff --git a/tools/ifwitool.c b/tools/ifwitool.c
index 2e020a82824fd9fd6cafb4441a5ebeee2cdf6815..543e9d4e702665c0d105adcc6ee7a6112054fac0 100644 (file)
--- a/tools/ifwitool.c
+++ b/tools/ifwitool.c
@@ -10,7 +10,9 @@
 #include <getopt.h>
 #include "os_support.h"
 
+#ifndef __packed
 #define __packed               __attribute__((packed))
+#endif
 #define KiB                    1024
 #define ALIGN(x, a)            __ALIGN_MASK((x), (typeof(x))(a) - 1)
 #define __ALIGN_MASK(x, mask)  (((x) + (mask)) & ~(mask))