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 /board/freescale/t102xqds | |
| parent | 8160c38ca1fde4386db5a4ee07e86e397a4914df (diff) | |
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 'board/freescale/t102xqds')
| -rw-r--r-- | board/freescale/t102xqds/spl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c index 3008f0919f..7a499a559f 100644 --- a/board/freescale/t102xqds/spl.c +++ b/board/freescale/t102xqds/spl.c @@ -125,19 +125,19 @@ void board_init_r(gd_t *gd, ulong dest_addr) #ifdef CONFIG_SPL_NAND_BOOT nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_ENV_ADDR); + (uchar *)SPL_ENV_ADDR); #endif #ifdef CONFIG_SPL_MMC_BOOT mmc_initialize(bd); mmc_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_ENV_ADDR); + (uchar *)SPL_ENV_ADDR); #endif #ifdef CONFIG_SPL_SPI_BOOT fsl_spi_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_ENV_ADDR); + (uchar *)SPL_ENV_ADDR); #endif - gd->env_addr = (ulong)(CONFIG_ENV_ADDR); + gd->env_addr = (ulong)(SPL_ENV_ADDR); gd->env_valid = ENV_VALID; i2c_init_all(); |