From: Wolfgang Denk <wd@denx.de>
Date: Mon, 14 Sep 2009 22:09:21 +0000 (+0200)
Subject: board/flagadm/flash.c: fix compile warning
X-Git-Tag: v2009.11-rc1~107
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3b6a9267f0de7b85d387fa4123d0b58379363447;p=oweals%2Fu-boot.git

board/flagadm/flash.c: fix compile warning

Fix warning: flash.c:531: warning: dereferencing type-punned pointer
will break strict-aliasing rules

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kári Davíðsson <kd@flaga.is>
---

diff --git a/board/flagadm/flash.c b/board/flagadm/flash.c
index bbefbacea9..a69b1a4e97 100644
--- a/board/flagadm/flash.c
+++ b/board/flagadm/flash.c
@@ -528,11 +528,17 @@ int write_word (flash_info_t *info, ulong dest, ulong da)
 	ulong start;
 	char csr;
 	int flag;
-	ushort * d = (ushort*)&da;
 	int i;
+	union {
+		u32 data32;
+		u16 data16[2];
+	} data;
+
+	data.data32 = da;
 
 	/* Check if Flash is (sufficiently) erased */
-	if (((*addr & d[0]) != d[0]) || ((*(addr+1) & d[1]) != d[1])) {
+	if (((*addr & data.data16[0]) != data.data16[0]) ||
+	    ((*(addr+1) & data.data16[1]) != data.data16[1])) {
 		return (2);
 	}
 	/* Disable interrupts which might cause a timeout here */
@@ -544,7 +550,7 @@ int write_word (flash_info_t *info, ulong dest, ulong da)
 		*addr = 0x0010;
 
 		/* Write Data */
-		*addr = d[i];
+		*addr = data.data16[i];
 
 		/* re-enable interrupts if necessary */
 		if (flag)