diff options
| author | Tom Rini <[email protected]> | 2023-08-09 13:15:51 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-08-09 13:15:51 -0400 |
| commit | 321d7b4d875a77552a969dd6ea5bbed2644fcb0c (patch) | |
| tree | df15c6c203dcdd35fe15f7dae4ff024f82d5a618 /env | |
| parent | 1e1437d9f8b5be362afdd0212dbae6c41f53f3d8 (diff) | |
| parent | 06b51f77f5be60200a5f0037509c191b102e5e00 (diff) | |
Merge branch '2023-08-09-misc-cleanups' into next
- Rework the arch linker scripts to be consistent for all, support
Kconfig fragments in the board directory and fix some Kconfig options
that were hex-type by default of 0 not 0x0.
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/env/Kconfig b/env/Kconfig index 13e32104b4c..54203faa89e 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -571,7 +571,7 @@ config ENV_OFFSET default 0xE0000 if ARCH_ZYNQ default 0x1E00000 if ARCH_ZYNQMP default 0x7F40000 if ARCH_VERSAL || ARCH_VERSAL_NET - default 0 if ARC + default 0x0 if ARC default 0x140000 if ARCH_AT91 default 0x260000 if ARCH_OMAP2PLUS default 0x1080000 if MICROBLAZE && ENV_IS_IN_SPI_FLASH @@ -583,7 +583,7 @@ config ENV_OFFSET_REDUND depends on (ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \ ENV_IS_IN_SPI_FLASH) && SYS_REDUNDAND_ENVIRONMENT default 0x10C0000 if MICROBLAZE - default 0 + default 0x0 help Offset from the start of the device (or partition) of the redundant environment location. |