diff options
author | Tom Rini <trini@konsulko.com> | 2016-06-18 23:46:21 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-06-18 23:46:21 -0400 |
commit | a10a31ec91ad2ee514a42baea9314553aa972676 (patch) | |
tree | 4fa6eff1efde896343c455854b5c78b2b91bd9e9 /configs | |
parent | 2372b0012925f9100980151f4a28347c82feaba8 (diff) | |
parent | 1e6fb0e367564d427d7c57fa7b3b972ecb7147a3 (diff) | |
download | u-boot-a10a31ec91ad2ee514a42baea9314553aa972676.tar.gz |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
Diffstat (limited to 'configs')
-rw-r--r-- | configs/bcm11130_defconfig | 1 | ||||
-rw-r--r-- | configs/bcm11130_nand_defconfig | 1 | ||||
-rw-r--r-- | configs/bcm28155_ap_defconfig | 1 | ||||
-rw-r--r-- | configs/bcm28155_w1d_defconfig | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index b8ec8acefc..2716868a31 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -18,6 +18,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation" CONFIG_G_DNL_VENDOR_NUM=0x18d1 diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index 6021fd271a..8e01c521ee 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -18,6 +18,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation" CONFIG_G_DNL_VENDOR_NUM=0x18d1 diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 71a52a12ad..4c0f3b30ba 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -18,6 +18,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation" CONFIG_G_DNL_VENDOR_NUM=0x18d1 diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index 97fe622f91..e9d13b9c86 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -19,6 +19,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation" CONFIG_G_DNL_VENDOR_NUM=0x18d1 |