summaryrefslogtreecommitdiff
path: root/board/ti/beagle
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2014-04-29 17:41:19 +0200
committerStefano Babic <sbabic@denx.de>2014-04-29 17:41:19 +0200
commit3deb22a4844cbda1a05c60dd29d8926e4dddaa4e (patch)
tree767063f0d9e0acfd7445db47abf0d4ac94abdc1d /board/ti/beagle
parent3b31605aef069d183a9d0c1e3aa6f957503cd56b (diff)
parentc9aab0f9dd23fddcebf5984dc19e62b514e759a7 (diff)
downloadu-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.zip
u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.tar.gz
u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/ti/beagle')
-rw-r--r--board/ti/beagle/beagle.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 9669a32..0674afd 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -316,6 +316,7 @@ int misc_init_r(void)
struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE;
struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE;
struct control_prog_io *prog_io_base = (struct control_prog_io *)OMAP34XX_CTRL_BASE;
+ bool generate_fake_mac = false;
/* Enable i2c2 pullup resisters */
writel(~(PRG_I2C2_PULLUPRESX), &prog_io_base->io1);
@@ -349,6 +350,7 @@ int misc_init_r(void)
TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
TWL4030_PM_RECEIVER_DEV_GRP_P1);
+ generate_fake_mac = true;
break;
case REVISION_XM_C:
printf("Beagle xM Rev C\n");
@@ -359,6 +361,7 @@ int misc_init_r(void)
TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
TWL4030_PM_RECEIVER_DEV_GRP_P1);
+ generate_fake_mac = true;
break;
default:
printf("Beagle unknown 0x%02x\n", get_board_revision());
@@ -368,6 +371,7 @@ int misc_init_r(void)
TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
TWL4030_PM_RECEIVER_DEV_GRP_P1);
+ generate_fake_mac = true;
}
switch (get_expansion_id()) {
@@ -486,6 +490,13 @@ int misc_init_r(void)
musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE);
#endif
+ if (generate_fake_mac) {
+ u32 id[4];
+
+ get_dieid(id);
+ usb_fake_mac_from_die_id(id);
+ }
+
return 0;
}