diff options
author | Tom Rini <trini@konsulko.com> | 2020-06-25 09:33:39 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-06-25 09:33:39 -0400 |
commit | f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3 (patch) | |
tree | 393f3a5a757c2faf8e1506a6a94e70d253b591dd /configs/colibri_imx6_defconfig | |
parent | 6ccbd1590fb15b673c90c9ccde5da8dcaaf80a10 (diff) | |
parent | b8fd54d62f92658cbd20ca051304e13eabf24ddd (diff) | |
download | u-boot-WIP/25Jun2020-next.tar.gz |
Merge tag 'xilinx-for-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into nextWIP/25Jun2020-next
Xilinx changes for v2020.10
Versal:
- xspi bootmode fix
- Removing one clock from clk driver
- Align u-boot memory setting with OS by default
- Map TCM and OCM by default
ZynqMP:
- Minor DT improvements
- Reduce console buffer for mini configurations
- Add fix for AMS
- Add support for XDP platform
Zynq:
- Support for AES engine
- Enable bigger memory test by default
- Extend documentation for SD preparation
- Use different freq for Topic miami board
mmc:
- minor GD pointer removal
net:
- Support fixed-link cases by zynq gem
- Fix phy looking loop in axi enet driver
spi:
- Cleanup global macros for xilinx spi drivers
firmware:
- Add support for pmufw reloading
fpga:
- Improve error status reporting
common:
- Remove 4kB addition space for FDT allocation
Diffstat (limited to 'configs/colibri_imx6_defconfig')
-rw-r--r-- | configs/colibri_imx6_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 44a3ff859c..ca33327c6b 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -52,6 +52,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_NFS is not set CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_UUID=y @@ -64,6 +65,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352 +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y |