From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Date: Fri, 9 Mar 2018 13:07:20 +0000 (+0000)
Subject: imx: hab: Make usage of packed attribute consistent
X-Git-Tag: v2018.03~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f0d5bd4ba54862190f87295cc5a59e35a1e302c4;p=oweals%2Fu-boot.git

imx: hab: Make usage of packed attribute consistent

commit cd2d46003ce1 ("arm: imx: hab: Add IVT header definitions") declares
struct ivt_header as "__attribute__((packed))".

commit ed286bc80e9d ("imx: hab: Check if CSF is valid before
authenticating image") declares struct hab_hdr with __packed.

This patch makes the __packed convention consistent.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Utkarsh Gupta <utkarsh.gupta@nxp.com>
Cc: Breno Lima <breno.lima@nxp.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
---

diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h
index a522cbab89..ce9a44dacd 100644
--- a/arch/arm/include/asm/mach-imx/hab.h
+++ b/arch/arm/include/asm/mach-imx/hab.h
@@ -22,11 +22,11 @@
 #define IVT_HEADER_V1		0x40
 #define IVT_HEADER_V2		0x41
 
-struct ivt_header {
+struct __packed ivt_header {
 	uint8_t		magic;
 	uint16_t	length;
 	uint8_t		version;
-} __attribute__((packed));
+};
 
 struct ivt {
 	struct ivt_header hdr;	/* IVT header above */