diff options
| author | Tom Rini <[email protected]> | 2021-04-29 11:31:06 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-04-29 11:31:06 -0400 |
| commit | f3a0d2c1af630cc09a34c2159aa2dfa12b831762 (patch) | |
| tree | 08a339ed98c9daeb06d4471ea6a01b42cae37842 /env | |
| parent | 3d2f8bc673d8a8c0ecb2ba27d21f8c54152281ca (diff) | |
| parent | b00bad9dc81ee0337761cc50443dffa22a6cdedf (diff) | |
Merge tag 'xilinx-for-v2021.07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2021.07-rc2
xilinx:
- Enable saving variables based on bootmode
- Cleanup usb dfu setup and wire it up with usb bootmode
- Fix bootscript address logic
- Remove GD references (spi, Versal)
- Enable capsule update
clk:
- Small Kconfig fix
net:
- Fix gmii2rgmii bridge binding
usb:
- Propagate error (dfu gadget)
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/env/Kconfig b/env/Kconfig index 08e49c2a47f..1b7906cf726 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -445,7 +445,7 @@ config ENV_FAT_DEVICE_AND_PART string "Device and partition for where to store the environemt in FAT" depends on ENV_IS_IN_FAT default "0:1" if TI_COMMON_CMD_OPTIONS - default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP + default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL default "0:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 default "1:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 default "0" if ARCH_AT91 @@ -556,6 +556,7 @@ config ENV_OFFSET_REDUND hex "Redundant environment offset" depends on (ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \ ENV_IS_IN_SPI_FLASH) && SYS_REDUNDAND_ENVIRONMENT + default 0 help Offset from the start of the device (or partition) of the redundant environment location. |