[PATCH] tools: imx8mimage: Restore the original __ALIGN_MASK() macro

[PATCH] tools: imx8mimage: Restore the original __ALIGN_MASK() macro

[Fabio Estevam]

Since commit c738adb8dbbf ("tool: Move ALIGN_MASK to header as common MACRO")
the i.MX8MQ EVK board no longer boots.

The reason is that imx8mimage.c used a custom __ALIGN_MASK() macro, so
restore the original macro to fix the boot.

Reported-by: Lukas Rusak <lorusak@gmail.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 tools/imx8mimage.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c
index bc4ee793cb97..057a55838a8f 100644
--- a/tools/imx8mimage.c
+++ b/tools/imx8mimage.c
@@ -32,6 +32,8 @@ static uint32_t rom_version = ROM_V1;
 
 #define HDMI_FW_SIZE		0x17000 /* Use Last 0x1000 for IVT and CSF */
 #define ALIGN_SIZE		0x1000
+#define ALIGN(x, a)			__ALIGN_MASK((x), (__typeof__(x))(a) - 1, a)
+#define __ALIGN_MASK(x, mask, mask2)	(((x) + (mask)) / (mask2) * (mask2))
 
 static uint32_t get_cfg_value(char *token, char *name,  int linenr)
 {
-- 
2.25.1