X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=tools%2Fifwitool.c;h=b2b06cc9219b7a312071519e501f246bfb79d19f;hb=072114d9e01f4601e241a67e6281fe6f00d0d296;hp=2e020a82824fd9fd6cafb4441a5ebeee2cdf6815;hpb=df9a7a195bdf0722399199bf373afc8309ae3ad7;p=oweals%2Fu-boot.git

diff --git a/tools/ifwitool.c b/tools/ifwitool.c
index 2e020a8282..b2b06cc921 100644
--- a/tools/ifwitool.c
+++ b/tools/ifwitool.c
@@ -8,13 +8,13 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <getopt.h>
+#include "imagetool.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))
-#define ARRAY_SIZE(x)		(sizeof(x) / sizeof((x)[0]))
 
 /*
  * min()/max()/clamp() macros that also do