From a8992e788aba46f6f129af3111682be86236074f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 18 Nov 2019 20:02:07 -0500 Subject: env: Remove useless CONFIG_ENV_SIZE_REDUND and fix ENV_IS_REDUND check We have CONFIG_ENV_SIZE_IS_REDUND but don't really use it. We have one board where we can simply multiple CONFIG_ENV_SIZE by two for the same result. The other place where we could but were not previously using this is for where env_internal.h checks for if we should set ENV_IS_EMBEDDED. This seems like the most likely use, historically, of the variable, but it was not used. Add logic to check for this now. Cc: Wolfgang Denk Cc: Joe Hershberger Signed-off-by: Tom Rini Reviewed-by: Simon Glass Acked-by: Joe Hershberger --- include/configs/UCP1020.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/configs/UCP1020.h') diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 40080f512b..b2778a93c9 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -388,7 +388,6 @@ #if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT) /* Address and size of Redundant Environment Sector */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #endif #elif defined(CONFIG_RAMBOOT_SDCARD) @@ -408,7 +407,6 @@ #if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT) /* Address and size of Redundant Environment Sector */ #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #endif #endif -- cgit 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/UCP1020.h | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) (limited to 'include/configs/UCP1020.h') diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index b2778a93c9..68276a15a7 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -370,49 +370,11 @@ /* * Environment */ -#ifdef CONFIG_ENV_FIT_UCBOOT - -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x20000) -#define CONFIG_ENV_SIZE 0x20000 -#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ - -#else - - -#ifdef CONFIG_RAMBOOT_SPIFLASH - -#define CONFIG_ENV_SIZE 0x3000 /* 12KB */ -#define CONFIG_ENV_OFFSET 0x2000 /* 8KB */ -#define CONFIG_ENV_SECT_SIZE 0x1000 - -#if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT) -/* Address and size of Redundant Environment Sector */ -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#endif - -#elif defined(CONFIG_RAMBOOT_SDCARD) +#if !defined(CONFIG_ENV_FIT_UCBOOT) && defined(CONFIG_RAMBOOT_SDCARD) #define CONFIG_FSL_FIXED_MMC_LOCATION -#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MMC_ENV_DEV 0 - -#elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) -#define CONFIG_ENV_SIZE 0x2000 - -#else -#define CONFIG_ENV_BASE (CONFIG_SYS_FLASH_BASE) -#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ -#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_ADDR (CONFIG_ENV_BASE + 0xC0000) -#if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT) -/* Address and size of Redundant Environment Sector */ -#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) #endif -#endif - -#endif /* CONFIG_ENV_FIT_UCBOOT */ - #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ -- cgit