summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2009-07-03 12:45:44 -0500
committerKumar Gala <galak@kernel.crashing.org>2009-07-03 12:46:47 -0500
commitafb0b1315c048ce2b1f35f0183b8b118ad0c14e1 (patch)
tree80dc28a2556716d23da60ee1514d827207786b79
parente94e460c6e8741f42dab6d8dd4b596ba5d9d79ae (diff)
downloadu-boot-imx-afb0b1315c048ce2b1f35f0183b8b118ad0c14e1.zip
u-boot-imx-afb0b1315c048ce2b1f35f0183b8b118ad0c14e1.tar.gz
u-boot-imx-afb0b1315c048ce2b1f35f0183b8b118ad0c14e1.tar.bz2
fsl: Fix compiler warnings from gcc-4.4 in sys_eeprom code
sys_eeprom.c: In function 'do_mac': sys_eeprom.c:323: warning: dereferencing type-punned pointer will break strict-aliasing rules sys_eeprom.c: In function 'mac_read_from_eeprom': sys_eeprom.c:395: warning: dereferencing type-punned pointer will break strict-aliasing rules Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--board/freescale/common/sys_eeprom.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index ae5304a..3e1e332 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -78,12 +78,14 @@ static int has_been_read = 0;
#ifdef CONFIG_SYS_I2C_EEPROM_NXID
/* Is this a valid NXID EEPROM? */
-#define is_valid (*((u32 *)e.id) == (('N' << 24) | ('X' << 16) | ('I' << 8) | 'D'))
+#define is_valid ((e.id[0] == 'N') || (e.id[1] == 'X') || \
+ (e.id[2] == 'I') || (e.id[3] == 'D'))
#endif
#ifdef CONFIG_SYS_I2C_EEPROM_CCID
/* Is this a valid CCID EEPROM? */
-#define is_valid (*((u32 *)e.id) == (('C' << 24) | ('C' << 16) | ('I' << 8) | 'D'))
+#define is_valid ((e.id[0] == 'C') || (e.id[1] == 'C') || \
+ (e.id[2] == 'I') || (e.id[3] == 'D'))
#endif
/**