Merge tag 'efi-2020-07-rc4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/tools/ifwitool.c b/tools/ifwitool.c
index 543e9d4e702665c0d105adcc6ee7a6112054fac0..b2b06cc9219b7a312071519e501f246bfb79d19f 100644 (file)
--- a/tools/ifwitool.c
+++ b/tools/ifwitool.c
@@ -8,15 +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