[U-Boot] [RFC PATCH 1/2] ARM: rpi_b: enable USB features in config
* Enable USB HW driver * Don't disable USB-related commands any more * Add USB-related support to bootcmd
Signed-off-by: Stephen Warren swarren@wwwdotorg.org --- These two patches are RFC, since they rely on the DWC2 USB driver, from: [RFC PATCH] usb: add driver for Synopsis DWC2 USB IP block
include/configs/rpi_b.h | 60 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 10 deletions(-)
diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h index 68bb2b0..0061de5 100644 --- a/include/configs/rpi_b.h +++ b/include/configs/rpi_b.h @@ -146,6 +146,41 @@ "bootcmd_mmc0=setenv devnum 0; run mmc_boot;\0" #define BOOT_TARGETS_MMC "mmc0"
+#define BOOTCMD_INIT_USB "run usb_init; " +#define BOOTCMDS_USB \ + "usb_init=" \ + "if ${usb_need_init}; then " \ + "set usb_need_init false; " \ + "usb start 0; " \ + "fi\0" \ + \ + "usb_boot=" \ + "setenv devtype usb; " \ + BOOTCMD_INIT_USB \ + "if usb dev ${devnum}; then " \ + "run scan_boot; " \ + "fi\0" \ + \ + "bootcmd_usb0=setenv devnum 0; run usb_boot;\0" +#define BOOT_TARGETS_USB "usb0" + +#define BOOTCMDS_DHCP \ + "bootcmd_dhcp=" \ + BOOTCMD_INIT_USB \ + "if dhcp ${scriptaddr} boot.scr.uimg; then "\ + "source ${scriptaddr}; " \ + "fi\0" +#define BOOT_TARGETS_DHCP "dhcp" + +#define BOOTCMDS_PXE \ + "bootcmd_pxe=" \ + BOOTCMD_INIT_USB \ + "dhcp; " \ + "if pxe get; then " \ + "pxe boot; " \ + "fi\0" +#define BOOT_TARGETS_PXE "pxe" + #define BOOTCMDS_COMMON \ "rootpart=1\0" \ \ @@ -187,18 +222,22 @@ \ "boot_targets=" \ BOOT_TARGETS_MMC " " \ + BOOT_TARGETS_USB " " \ + BOOT_TARGETS_PXE " " \ + BOOT_TARGETS_DHCP " " \ "\0" \ \ "boot_prefixes=/\0" \ \ "boot_scripts=boot.scr.uimg\0" \ \ - BOOTCMDS_MMC - -#define CONFIG_BOOTCOMMAND \ - "for target in ${boot_targets}; do run bootcmd_${target}; done" + BOOTCMDS_MMC \ + BOOTCMDS_USB \ + BOOTCMDS_DHCP \ + BOOTCMDS_PXE
#define CONFIG_BOOTCOMMAND \ + "set usb_need_init; " \ "for target in ${boot_targets}; do run bootcmd_${target}; done"
#define CONFIG_EXTRA_ENV_SETTINGS \ @@ -227,16 +266,17 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG
+/* USB support */ +#define CONFIG_USB_DWC2_OTG +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_STORAGE +#define CONFIG_USB_ETHER_SMSC95XX +#define CONFIG_CMD_USB + #include <config_distro_defaults.h>
/* Some things don't make sense on this HW or yet */ #undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_NET -#undef CONFIG_CMD_NFS #undef CONFIG_CMD_SAVEENV -#undef CONFIG_CMD_DHCP -#undef CONFIG_CMD_MII -#undef CONFIG_CMD_NET -#undef CONFIG_CMD_PING
#endif
The built-in SMSC 95xx chip doesn't know its own MAC address. Instead, we must query it from the VC firmware; it's probably encoded in fuses on the BCM2835.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org --- arch/arm/include/asm/arch-bcm2835/mbox.h | 14 ++++++++++++++ board/raspberrypi/rpi_b/rpi_b.c | 26 ++++++++++++++++++++++++++ include/configs/rpi_b.h | 1 + 3 files changed, 41 insertions(+)
diff --git a/arch/arm/include/asm/arch-bcm2835/mbox.h b/arch/arm/include/asm/arch-bcm2835/mbox.h index dded857..61f427d 100644 --- a/arch/arm/include/asm/arch-bcm2835/mbox.h +++ b/arch/arm/include/asm/arch-bcm2835/mbox.h @@ -119,6 +119,20 @@ struct bcm2835_mbox_tag_hdr { * }; */
+#define BCM2835_MBOX_TAG_GET_MAC_ADDRESS 0x00010003 + +struct bcm2835_mbox_tag_get_mac_address { + struct bcm2835_mbox_tag_hdr tag_hdr; + union { + struct { + } req; + struct { + u8 mac[6]; + u8 pad[2]; + } resp; + } body; +}; + #define BCM2835_MBOX_TAG_GET_ARM_MEMORY 0x00010005
struct bcm2835_mbox_tag_get_arm_mem { diff --git a/board/raspberrypi/rpi_b/rpi_b.c b/board/raspberrypi/rpi_b/rpi_b.c index f33fae9..eaeb182 100644 --- a/board/raspberrypi/rpi_b/rpi_b.c +++ b/board/raspberrypi/rpi_b/rpi_b.c @@ -29,6 +29,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; @@ -60,6 +66,26 @@ int dram_init(void) return 0; }
+int misc_init_r(void) +{ + ALLOC_ALIGN_BUFFER(struct msg_get_mac_address, msg, 1, 16); + int ret; + + 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); diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h index 0061de5..480d747 100644 --- a/include/configs/rpi_b.h +++ b/include/configs/rpi_b.h @@ -272,6 +272,7 @@ #define CONFIG_USB_STORAGE #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_CMD_USB +#define CONFIG_MISC_INIT_R
#include <config_distro_defaults.h>
participants (1)
-
Stephen Warren