summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-11-09 09:29:01 +0000
committerWolfgang Denk <wd@denx.de>2011-11-16 21:04:32 +0100
commit504f7080c33f2b39ac9528b00421f3da9096309b (patch)
tree497a1230d857bb90f308cb54be94f56f4a19c5af
parent827320724c014adec7cc2db422ae9f049f46a891 (diff)
downloadu-boot-imx-504f7080c33f2b39ac9528b00421f3da9096309b.zip
u-boot-imx-504f7080c33f2b39ac9528b00421f3da9096309b.tar.gz
u-boot-imx-504f7080c33f2b39ac9528b00421f3da9096309b.tar.bz2
board/evb64260/zuma_pbb_mbox.c: Fix GCC 4.6 build warnings
Fix: zuma_pbb_mbox.c: In function 'zuma_mbox_dump': zuma_pbb_mbox.c:115:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] zuma_pbb_mbox.c:117:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--board/evb64260/zuma_pbb_mbox.c25
1 files changed, 18 insertions, 7 deletions
diff --git a/board/evb64260/zuma_pbb_mbox.c b/board/evb64260/zuma_pbb_mbox.c
index 3d7c976..621c64c 100644
--- a/board/evb64260/zuma_pbb_mbox.c
+++ b/board/evb64260/zuma_pbb_mbox.c
@@ -112,13 +112,24 @@ static int zuma_mbox_do_all_mailbox(void)
static void zuma_mbox_dump(void)
{
- printf("ACC MAC=%04x%08x\n", *(unsigned short *) (&zuma_acc_mac),
- *(unsigned int *) ((char *) &zuma_acc_mac + 2));
- printf("PRV MAC=%04x%08x\n", *(unsigned short *) (&zuma_prv_mac),
- *(unsigned int *) ((char *) &zuma_prv_mac + 2));
- printf("slot:bac=%d:%d\n", (zuma_slot_bac >> 2) & 0xf,
- zuma_slot_bac & 0x3);
- printf("BAUD1=%d BAUD2=%d\n", zuma_console_baud, zuma_debug_baud);
+ unsigned short s;
+ unsigned int i;
+
+ memcpy(&s, &zuma_acc_mac, sizeof(s));
+ memcpy(&i, &zuma_acc_mac[2], sizeof(i));
+ printf("ACC MAC=%04x%08x\n", s, i);
+
+ memcpy(&s, &zuma_prv_mac, sizeof(s));
+ memcpy(&s, &zuma_prv_mac[2], sizeof(i));
+ printf("PRV MAC=%04x%08x\n", s, i);
+
+ printf("slot:bac=%d:%d\n",
+ (zuma_slot_bac >> 2) & 0xf,
+ zuma_slot_bac & 0x3);
+
+ printf("BAUD1=%d BAUD2=%d\n",
+ zuma_console_baud,
+ zuma_debug_baud);
}