diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-20 09:31:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-20 09:31:58 -0400 |
| commit | eb6b50f631628f48b7e72432ae878e6ff0e306c3 (patch) | |
| tree | 40a37edba62f5769156b543ea7a5e9c9377d5a15 /include/configs/bcm28155_ap.h | |
| parent | ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be (diff) | |
| parent | e6c0bc0643e5a4387fecbcf83080d0b796eb067c (diff) | |
| download | u-boot-eb6b50f631628f48b7e72432ae878e6ff0e306c3.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts:
configs/bcm28155_ap_defconfig
configs/dra72_evm_defconfig
configs/dra74_evm_defconfig
configs/ma5d4evk_defconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/bcm28155_ap.h')
| -rw-r--r-- | include/configs/bcm28155_ap.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 052a1fa9e8..be8cb80a5c 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -141,14 +141,7 @@ #define CONFIG_SYS_CACHELINE_SIZE 64 #define CONFIG_FASTBOOT_BUF_SIZE (CONFIG_SYS_SDRAM_SIZE - SZ_1M) #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE -#define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_USB_GADGET_VBUS_DRAW 0 -#define CONFIG_USB_GADGET_DWC2_OTG #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USBID_ADDR 0x34052c46 -#define CONFIG_G_DNL_VENDOR_NUM 0x18d1 /* google */ -#define CONFIG_G_DNL_PRODUCT_NUM 0x0d02 /* nexus one */ -#define CONFIG_G_DNL_MANUFACTURER "Broadcom Corporation" #endif /* __BCM28155_AP_H */ |