diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-06 10:04:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-06 13:37:56 -0400 |
| commit | ffd859979e2a84bccc14188d9fa760b2e4813515 (patch) | |
| tree | 276cb26811a0da6696148e3628d4af36c4c721df /include/configs/xilinx_zynqmp.h | |
| parent | 1cb9cb3ec0f19b8c54bb01670a530f5bc210d5f3 (diff) | |
| parent | 10db7500369ea000af4c4c5b039b7946c2865ae9 (diff) | |
| download | blackbird-obmc-uboot-ffd859979e2a84bccc14188d9fa760b2e4813515.tar.gz blackbird-obmc-uboot-ffd859979e2a84bccc14188d9fa760b2e4813515.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Modified:
configs/ls1012afrdm_qspi_defconfig
configs/ls1012aqds_qspi_defconfig
configs/ls1012ardb_qspi_defconfig
include/configs/ls1012afrdm.h
include/configs/ls1012aqds.h
include/configs/ls1012ardb.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/xilinx_zynqmp.h')
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index fc2e1f72d0..b848150182 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -115,8 +115,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x8000000 #if defined(CONFIG_ZYNQMP_USB) -#define CONFIG_USB_XHCI_DWC3 -#define CONFIG_USB_XHCI #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_USB_STORAGE |
