diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-22 13:22:26 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-22 13:22:26 (GMT) |
| commit | 9f03247edc7761b608db31104821b4518a70e691 (patch) | |
| tree | 1f42f9d51050f960148adc49177f811b250588b9 /configs/zynq_zed_defconfig | |
| parent | 89ca873e2ddea859526f25f678fa53dda055e90f (diff) | |
| parent | 766d2609dd7fbad0faa89c7dff26edc108afa890 (diff) | |
| download | u-boot-fsl-qoriq-9f03247edc7761b608db31104821b4518a70e691.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'configs/zynq_zed_defconfig')
| -rw-r--r-- | configs/zynq_zed_defconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index c70b860..d5d6223 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -1,14 +1,14 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_zed" +CONFIG_SYS_CONFIG_NAME="zynq-common" CONFIG_ARCH_ZYNQ=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y -CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " +CONFIG_SYS_NO_FLASH=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y @@ -38,9 +38,12 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_ZYNQ_GEM=y CONFIG_ZYNQ_QSPI=y CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y +CONFIG_USB_STORAGE=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Xilinx" |