diff options
author | Tom Rini <trini@konsulko.com> | 2019-11-18 20:02:10 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-11-20 18:32:09 -0500 |
commit | a09fea1d28fe3c69a64bee092f5a764274d26ca2 (patch) | |
tree | 93c09653555ff696eb7705a74475a711cea8b316 /include/configs/am335x_shc.h | |
parent | 8160c38ca1fde4386db5a4ee07e86e397a4914df (diff) | |
download | u-boot-a09fea1d28fe3c69a64bee092f5a764274d26ca2.tar.gz u-boot-a09fea1d28fe3c69a64bee092f5a764274d26ca2.tar.bz2 u-boot-a09fea1d28fe3c69a64bee092f5a764274d26ca2.zip |
env: Finish migration of common ENV options
- In ARMv8 NXP Layerscape platforms we also need to make use of
CONFIG_SYS_RELOC_GD_ENV_ADDR now, do so.
- On ENV_IS_IN_REMOTE, CONFIG_ENV_OFFSET is never used, drop the define
to 0.
- Add Kconfig entry for ENV_ADDR.
- Make ENV_ADDR / ENV_OFFSET depend on the env locations that use it.
- Add ENV_xxx_REDUND options that depend on their primary option and
SYS_REDUNDAND_ENVIRONMENT
- On a number of PowerPC platforms, use SPL_ENV_ADDR not CONFIG_ENV_ADDR
for the pre-main-U-Boot environment location.
- On ENV_IS_IN_SPI_FLASH, check not for CONFIG_ENV_ADDR being set but
rather it being non-zero, as it will now be zero by default.
- Rework the env_offset absolute in env/embedded.o to not use
CONFIG_ENV_OFFSET as it was the only use of ENV_OFFSET within
ENV_IS_IN_FLASH.
- Migrate all platforms.
Cc: Wolfgang Denk <wd@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: uboot-stm32@st-md-mailman.stormreply.com
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Diffstat (limited to 'include/configs/am335x_shc.h')
-rw-r--r-- | include/configs/am335x_shc.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index b34e48cb45..eabf19ddeb 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -45,13 +45,9 @@ * ENV at MMC Boot0 Partition - 0/Undefined=user, 1=boot0, 2=boot1, * 4..7=general0..3 */ -#define CONFIG_ENV_SIZE 0x1000 /* 4 KB */ -#define CONFIG_ENV_OFFSET 0x7000 /* 28 kB */ #define CONFIG_HSMMC2_8BIT -#define CONFIG_ENV_OFFSET_REDUND 0x9000 /* 36 kB */ - #ifndef CONFIG_SHC_ICT /* * In builds other than ICT, reset to retry after timeout |