diff options
author | Tom Rini <trini@ti.com> | 2014-10-26 18:12:18 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-10-26 18:12:18 (GMT) |
commit | 1fba907f9a8d178eee960294ecffc8ee8bc6b00d (patch) | |
tree | 5152c87ab6fcc544e4b125a0d1d6f92e120db9c5 /board/raspberrypi/rpi_b/rpi_b.c | |
parent | 84a6df09c78bc9e9cbc6265d99c9097f5f1079f2 (diff) | |
parent | 09bab6e77026d4b4e7682e56b470adf6e9f81563 (diff) | |
download | u-boot-fsl-qoriq-1fba907f9a8d178eee960294ecffc8ee8bc6b00d.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'board/raspberrypi/rpi_b/rpi_b.c')
-rw-r--r-- | board/raspberrypi/rpi_b/rpi_b.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/board/raspberrypi/rpi_b/rpi_b.c b/board/raspberrypi/rpi_b/rpi_b.c index 447c940..7445f53 100644 --- a/board/raspberrypi/rpi_b/rpi_b.c +++ b/board/raspberrypi/rpi_b/rpi_b.c @@ -42,6 +42,12 @@ struct msg_get_arm_mem { u32 end_tag; }; +struct msg_get_mac_address { + struct bcm2835_mbox_hdr hdr; + struct bcm2835_mbox_tag_get_mac_address get_mac_address; + u32 end_tag; +}; + struct msg_set_power_state { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_set_power_state set_power_state; @@ -73,6 +79,29 @@ int dram_init(void) return 0; } +int misc_init_r(void) +{ + ALLOC_ALIGN_BUFFER(struct msg_get_mac_address, msg, 1, 16); + int ret; + + if (getenv("usbethaddr")) + return 0; + + BCM2835_MBOX_INIT_HDR(msg); + BCM2835_MBOX_INIT_TAG(&msg->get_mac_address, GET_MAC_ADDRESS); + + ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg->hdr); + if (ret) { + printf("bcm2835: Could not query MAC address\n"); + /* Ignore error; not critical */ + return 0; + } + + eth_setenv_enetaddr("usbethaddr", msg->get_mac_address.body.resp.mac); + + return 0; +} + static int power_on_module(u32 module) { ALLOC_ALIGN_BUFFER(struct msg_set_power_state, msg_pwr, 1, 16); |