summaryrefslogtreecommitdiff
path: root/board/ti/omap5_uevm/evm.c
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-04-21 21:01:35 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-04-21 21:01:35 +0200
commitc9aab0f9dd23fddcebf5984dc19e62b514e759a7 (patch)
tree65ce91815907466f07e87d8b79eaf19763c282bf /board/ti/omap5_uevm/evm.c
parent94b972d366c29b92319865e3ded16da062aa8507 (diff)
parent2e8f5dc16ad360cc15ea402a1dc4d421a04adbbd (diff)
downloadu-boot-imx-c9aab0f9dd23fddcebf5984dc19e62b514e759a7.zip
u-boot-imx-c9aab0f9dd23fddcebf5984dc19e62b514e759a7.tar.gz
u-boot-imx-c9aab0f9dd23fddcebf5984dc19e62b514e759a7.tar.bz2
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/ti/omap5_uevm/evm.c')
-rw-r--r--board/ti/omap5_uevm/evm.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 3eaa5ac..4666b38 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -119,28 +119,19 @@ static void enable_host_clocks(void)
int misc_init_r(void)
{
int reg;
- uint8_t device_mac[6];
+ u32 id[4];
#ifdef CONFIG_PALMAS_POWER
palmas_init_settings();
#endif
- if (!getenv("usbethaddr")) {
- reg = DIE_ID_REG_BASE + DIE_ID_REG_OFFSET;
-
- /*
- * create a fake MAC address from the processor ID code.
- * first byte is 0x02 to signify locally administered.
- */
- device_mac[0] = 0x02;
- device_mac[1] = readl(reg + 0x10) & 0xff;
- device_mac[2] = readl(reg + 0xC) & 0xff;
- device_mac[3] = readl(reg + 0x8) & 0xff;
- device_mac[4] = readl(reg) & 0xff;
- device_mac[5] = (readl(reg) >> 8) & 0xff;
-
- eth_setenv_enetaddr("usbethaddr", device_mac);
- }
+ reg = DIE_ID_REG_BASE + DIE_ID_REG_OFFSET;
+
+ id[0] = readl(reg);
+ id[1] = readl(reg + 0x8);
+ id[2] = readl(reg + 0xC);
+ id[3] = readl(reg + 0x10);
+ usb_fake_mac_from_die_id(id);
return 0;
}