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 --- board/freescale/b4860qds/spl.c | 4 ++-- board/freescale/c29xpcie/spl.c | 4 ++-- board/freescale/p1010rdb/spl.c | 4 ++-- board/freescale/p1022ds/spl.c | 4 ++-- board/freescale/p1_p2_rdb_pc/spl.c | 4 ++-- board/freescale/t102xqds/spl.c | 8 ++++---- board/freescale/t102xrdb/spl.c | 8 ++++---- board/freescale/t104xrdb/spl.c | 8 ++++---- board/freescale/t208xqds/spl.c | 8 ++++---- board/freescale/t208xrdb/spl.c | 8 ++++---- board/freescale/t4qds/spl.c | 6 +++--- board/freescale/t4rdb/spl.c | 4 ++-- 12 files changed, 35 insertions(+), 35 deletions(-) (limited to 'board') diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c index 6dfc0c7..06ea877 100644 --- a/board/freescale/b4860qds/spl.c +++ b/board/freescale/b4860qds/spl.c @@ -100,8 +100,8 @@ void board_init_r(gd_t *gd, ulong dest_addr) #else /* relocate environment function pointers etc. */ nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_ENV_ADDR); - gd->env_addr = (ulong)(CONFIG_ENV_ADDR); + (uchar *)SPL_ENV_ADDR); + gd->env_addr = (ulong)(SPL_ENV_ADDR); gd->env_valid = ENV_VALID; #endif diff --git a/board/freescale/c29xpcie/spl.c b/board/freescale/c29xpcie/spl.c index 2904096..9a2385b 100644 --- a/board/freescale/c29xpcie/spl.c +++ b/board/freescale/c29xpcie/spl.c @@ -61,8 +61,8 @@ void board_init_r(gd_t *gd, ulong dest_addr) /* relocate environment function pointers etc. */ nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_ENV_ADDR); - gd->env_addr = (ulong)(CONFIG_ENV_ADDR); + (uchar *)SPL_ENV_ADDR); + gd->env_addr = (ulong)(SPL_ENV_ADDR); gd->env_valid = ENV_VALID; i2c_init_all(); diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c index 8f050b3..cb48914 100644 --- a/board/freescale/p1010rdb/spl.c +++ b/board/freescale/p1010rdb/spl.c @@ -86,8 +86,8 @@ void board_init_r(gd_t *gd, ulong dest_addr) /* relocate environment function pointers etc. */ #ifdef CONFIG_SPL_NAND_BOOT nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_ENV_ADDR); - gd->env_addr = (ulong)(CONFIG_ENV_ADDR); + (uchar *)SPL_ENV_ADDR); + gd->env_addr = (ulong)(SPL_ENV_ADDR); gd->env_valid = ENV_VALID; #else env_relocate(); diff --git a/board/freescale/p1022ds/spl.c b/board/freescale/p1022ds/spl.c index 06273f1..8d2c138 100644 --- a/board/freescale/p1022ds/spl.c +++ b/board/freescale/p1022ds/spl.c @@ -98,9 +98,9 @@ void board_init_r(gd_t *gd, ulong dest_addr) /* relocate environment function pointers etc. */ #ifdef CONFIG_SPL_NAND_BOOT nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_ENV_ADDR); + (uchar *)SPL_ENV_ADDR); - gd->env_addr = (ulong)(CONFIG_ENV_ADDR); + gd->env_addr = (ulong)(SPL_ENV_ADDR); gd->env_valid = ENV_VALID; #else env_relocate(); diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c index dbf9f73..908f4bc 100644 --- a/board/freescale/p1_p2_rdb_pc/spl.c +++ b/board/freescale/p1_p2_rdb_pc/spl.c @@ -91,8 +91,8 @@ void board_init_r(gd_t *gd, ulong dest_addr) /* relocate environment function pointers etc. */ #ifdef CONFIG_SPL_NAND_BOOT nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_ENV_ADDR); - gd->env_addr = (ulong)(CONFIG_ENV_ADDR); + (uchar *)SPL_ENV_ADDR); + gd->env_addr = (ulong)(SPL_ENV_ADDR); gd->env_valid = ENV_VALID; #else env_relocate(); diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c index 3008f09..7a499a5 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(); diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c index 029e3d2..c579be1 100644 --- a/board/freescale/t102xrdb/spl.c +++ b/board/freescale/t102xrdb/spl.c @@ -112,19 +112,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(); diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c index 7df371d..2d1342f 100644 --- a/board/freescale/t104xrdb/spl.c +++ b/board/freescale/t104xrdb/spl.c @@ -110,17 +110,17 @@ void board_init_r(gd_t *gd, ulong dest_addr) defined(CONFIG_ENV_IS_IN_SPI_FLASH) #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_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; #endif diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c index 9695dfc..f0499ad 100644 --- a/board/freescale/t208xqds/spl.c +++ b/board/freescale/t208xqds/spl.c @@ -111,19 +111,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(); diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c index ca7d6a2..d7ca0dd 100644 --- a/board/freescale/t208xrdb/spl.c +++ b/board/freescale/t208xrdb/spl.c @@ -81,19 +81,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(); diff --git a/board/freescale/t4qds/spl.c b/board/freescale/t4qds/spl.c index 7666fe7..df81205 100644 --- a/board/freescale/t4qds/spl.c +++ b/board/freescale/t4qds/spl.c @@ -120,15 +120,15 @@ 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 - gd->env_addr = (ulong)(CONFIG_ENV_ADDR); + gd->env_addr = (ulong)(SPL_ENV_ADDR); gd->env_valid = ENV_VALID; i2c_init_all(); diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c index a19558b..ec3978a 100644 --- a/board/freescale/t4rdb/spl.c +++ b/board/freescale/t4rdb/spl.c @@ -84,9 +84,9 @@ void board_init_r(gd_t *gd, ulong dest_addr) mmc_initialize(bd); mmc_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (uchar *)CONFIG_ENV_ADDR); + (uchar *)SPL_ENV_ADDR); - gd->env_addr = (ulong)(CONFIG_ENV_ADDR); + gd->env_addr = (ulong)(SPL_ENV_ADDR); gd->env_valid = ENV_VALID; i2c_init_all(); -- cgit v1.1