diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-27 16:49:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-27 16:49:19 -0400 |
| commit | 1e6776000efba7027d85eedcd532ba8e78e0fb6e (patch) | |
| tree | 548a07d0aabe03f56bcb41fbddd2d210f2aa10a4 | |
| parent | 509b498a500afab1111d69f789b630c699b071a3 (diff) | |
| parent | 0a5559c10a8be58537398114619f8d9a26bae46d (diff) | |
Merge tag 'xilinx-fixes-for-v2017.05' of git://www.denx.de/git/u-boot-microblaze
Xilinx fixes for v2017.05
- Fix usbotg on Miami board
- Cleanup zc1751 defconfig
| -rw-r--r-- | arch/arm/dts/zynq-topic-miami.dts | 1 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/zynq-topic-miami.dts b/arch/arm/dts/zynq-topic-miami.dts index aa05c4d368..79a3671a8e 100644 --- a/arch/arm/dts/zynq-topic-miami.dts +++ b/arch/arm/dts/zynq-topic-miami.dts @@ -19,6 +19,7 @@ i2c0 = &i2c0; i2c1 = &i2c1; mmc0 = &sdhci0; + usbotg0 = &usb0; }; memory@0 { diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig index aa40be0ed6..6682b679b3 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -3,7 +3,6 @@ CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm016_dc2" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 -# CONFIG_SPL_MMC_SUPPORT is not set # CONFIG_SPL_LIBDISK_SUPPORT is not set # CONFIG_SPL_FAT_SUPPORT is not set CONFIG_ZYNQMP_USB=y |