summaryrefslogtreecommitdiff
path: root/drivers/net/uli526x.c
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2010-11-02 14:09:18 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2010-11-02 14:09:18 +0900
commit37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626 (patch)
tree93439a245bc837bec3ec9e812b775ebed730c2fa /drivers/net/uli526x.c
parentd9abba8254c3e6b9a1d5c2e52c2d8088bbeb520f (diff)
parent66fca016057b1c6b697552cc7220ebada9d4f82d (diff)
downloadu-boot-imx-37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626.zip
u-boot-imx-37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626.tar.gz
u-boot-imx-37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/net/uli526x.c')
-rw-r--r--drivers/net/uli526x.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 56eee7b..d626d68 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Freescale Semiconductor, Inc.
+ * Copyright 2007, 2010 Freescale Semiconductor, Inc.
*
* Author: Roy Zang <tie-fei.zang@freescale.com>, Sep, 2007
*
@@ -311,7 +311,8 @@ static int uli526x_init_one(struct eth_device *dev, bd_t *bis)
i));
/* Set Node address */
- if (((u16 *) db->srom)[0] == 0xffff || ((u16 *) db->srom)[0] == 0)
+ if (((db->srom[0] == 0xff) && (db->srom[1] == 0xff)) ||
+ ((db->srom[0] == 0x00) && (db->srom[1] == 0x00)))
/* SROM absent, so write MAC address to ID Table */
set_mac_addr(dev);
else { /*Exist SROM*/