arm: a37xx: pci: Fix a3700_fdt_fix_pcie_regions() function

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

diff --git a/tools/ifwitool.c b/tools/ifwitool.c
index 2e020a8..b2b06cc 100644 (file)
--- 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