diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
| commit | 891483186052b259852f3f48926ff307763f4eb0 (patch) | |
| tree | 019e4a490e40ad5459f7dd3d4129021be696c495 /env | |
| parent | 36fec02b1f90b92cf51ec531564f9284eae27ab4 (diff) | |
| parent | 67bbc1ecd311c78b06e845a3fd4e333806782367 (diff) | |
| download | u-boot-891483186052b259852f3f48926ff307763f4eb0.tar.gz | |
Merge branch 'next'
Pull in changes that have been pending in our 'next' branch. This
includes:
- A large number of CI improvements including moving to gcc-9.2 for all
platforms.
- amlogic, xilinx, stm32, TI SoC updates
- USB and i2c subsystem updtaes
- Re-sync Kbuild/etc logic with v4.19 of the Linux kernel.
- RSA key handling improvements
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/env/Kconfig b/env/Kconfig index 0d6f559b39..8ab7be11c5 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -404,8 +404,7 @@ config SYS_REDUNDAND_ENVIRONMENT config ENV_FAT_INTERFACE string "Name of the block device for the environment" depends on ENV_IS_IN_FAT - default "mmc" if ARCH_SUNXI - default "mmc" if TI_COMMON_CMD_OPTIONS || ARCH_ZYNQMP || ARCH_AT91 + default "mmc" help Define this to a string that is the name of the block device. @@ -500,6 +499,7 @@ config ENV_OFFSET default 0 if ARC default 0x140000 if ARCH_AT91 default 0x260000 if ARCH_OMAP2PLUS + default 0x1080000 if MICROBLAZE && ENV_IS_IN_SPI_FLASH help Offset from the start of the device (or partition) @@ -529,6 +529,7 @@ config ENV_SECT_SIZE default 0x2000 if ARCH_ROCKCHIP default 0x40000 if ARCH_ZYNQMP || ARCH_VERSAL default 0x20000 if ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91 + default 0x20000 if MICROBLAZE && ENV_IS_IN_SPI_FLASH help Size of the sector containing the environment. |