leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board/flagadm/flash.c: fix compile warning

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

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kri Davsson <kd@flaga.is>
This commit is contained in:
Wolfgang Denk 2009-09-15 00:09:21 +02:00
parent 084f3ddac6
commit 3b6a9267f0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
board/flagadm/flash.c
View File

@ -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)