summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-09-11 10:13:26 +0200
committerWolfgang Denk <wd@denx.de>2009-09-15 00:12:31 +0200
commitba73060cf4163bd5eb1711020126e2f7f62d363e (patch)
tree1c5018e80f72a8c8d1faaf8456fe19b90e10902e
parent2d6d9f0848e952ea33c658dfba335685a2725b8b (diff)
downloadu-boot-imx-ba73060cf4163bd5eb1711020126e2f7f62d363e.zip
u-boot-imx-ba73060cf4163bd5eb1711020126e2f7f62d363e.tar.gz
u-boot-imx-ba73060cf4163bd5eb1711020126e2f7f62d363e.tar.bz2
board/esd/common/flash.c: Fix compile warning
Fix warning: ../common/flash.c:635: warning: dereferencing type-punned pointer will break strict-aliasing rules Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Cc: Stefan Roese <sr@denx.de> Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu> Acked-by: Stefan Roese <sr@denx.de>
-rw-r--r--board/esd/common/flash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/esd/common/flash.c b/board/esd/common/flash.c
index 3ea053b..38a58fb 100644
--- a/board/esd/common/flash.c
+++ b/board/esd/common/flash.c
@@ -630,9 +630,10 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
*/
static int write_word (flash_info_t *info, ulong dest, ulong data)
{
+ ulong *data_ptr = &data;
volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2 = (CONFIG_SYS_FLASH_WORD_SIZE *)(info->start[0]);
volatile CONFIG_SYS_FLASH_WORD_SIZE *dest2 = (CONFIG_SYS_FLASH_WORD_SIZE *)dest;
- volatile CONFIG_SYS_FLASH_WORD_SIZE *data2 = (CONFIG_SYS_FLASH_WORD_SIZE *)&data;
+ volatile CONFIG_SYS_FLASH_WORD_SIZE *data2 = (CONFIG_SYS_FLASH_WORD_SIZE *)data_ptr;
ulong start;
int flag;
int i;