From a09fea1d28fe3c69a64bee092f5a764274d26ca2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 18 Nov 2019 20:02:10 -0500 Subject: 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 Cc: Joe Hershberger Cc: Patrick Delaunay Cc: uboot-stm32@st-md-mailman.stormreply.com Signed-off-by: Tom Rini Acked-by: Joe Hershberger Reviewed-by: Simon Goldschmidt --- include/configs/imx6dl-mamoj.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/configs/imx6dl-mamoj.h') diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 7605e145c2..b6e336a33d 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Total Size of Environment Sector */ -#define CONFIG_ENV_SIZE SZ_128K /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -25,9 +24,6 @@ /* Environment */ #ifndef CONFIG_ENV_IS_NOWHERE /* Environment in MMC */ -# if defined(CONFIG_ENV_IS_IN_MMC) -# define CONFIG_ENV_OFFSET 0x100000 -# endif #endif #ifndef CONFIG_SPL_BUILD -- cgit v1.2.3