diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-17 16:19:13 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-17 16:19:13 +0300 |
| commit | 14b8c420b88a90e7ca0c979a2ee413bf459941e8 (patch) | |
| tree | 89805507eebb3a6b14c94fe62c95546bacbe7f5a /configs | |
| parent | 88d5ab3d67c7507160792991e99bda9fff34d106 (diff) | |
| parent | 350cfe79a8fb288e9066d5668af7c5ab6857edea (diff) | |
| download | u-boot-14b8c420b88a90e7ca0c979a2ee413bf459941e8.tar.xz | |
Merge tag 'xilinx-for-v2019.07' of git://git.denx.de/u-boot-microblaze
Xilinx/FPGA changes for v2019.07
fpga:
- Add support for external data in FIT
- Extend testing for external data case
- Inform user about a need to run post config on Zynq
arm:
- Tune zynq command functions
- Fix internal variable setting
arm64:
- Add support for zc39dr decoding
- Disable WDT for zcu100
- Small changes in reset_reason()
- Some DT changes (spi)
- Tune qspi-mini configuration
- Remove useless eeprom setting
- Fix two sdhci boot case
spi:
- Fix tap delay programming
clk:
- Enable i2c in SPL
net:
- Fix gem phydev handling
- Remove phy detection code from gem driver
general:
- Correct EXT_DTB usage for MULTI_DTB_FIT configuration
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/xilinx_zynqmp_mini_qspi_defconfig | 2 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_zcu100_revC_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index ba521876b7..ec92104f0c 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -6,8 +6,10 @@ CONFIG_ENV_SIZE=0x80 CONFIG_SPL=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_ZYNQMP_NO_DDR=y +# CONFIG_PSCI_RESET is not set # CONFIG_CMD_ZYNQMP is not set CONFIG_NR_DRAM_BANKS=1 +# CONFIG_EXPERT is not set # CONFIG_IMAGE_FORMAT_LEGACY is not set # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/xilinx_zynqmp_zcu100_revC_defconfig b/configs/xilinx_zynqmp_zcu100_revC_defconfig index 6e0767164c..cd7d2f5376 100644 --- a/configs/xilinx_zynqmp_zcu100_revC_defconfig +++ b/configs/xilinx_zynqmp_zcu100_revC_defconfig @@ -85,8 +85,6 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y -CONFIG_WDT=y -CONFIG_WDT_CDNS=y CONFIG_SPL_GZIP=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y |