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/at91sam9n12ek.h | |
| parent | 8160c38ca1fde4386db5a4ee07e86e397a4914df (diff) | |
| download | u-boot-a09fea1d28fe3c69a64bee092f5a764274d26ca2.zip u-boot-a09fea1d28fe3c69a64bee092f5a764274d26ca2.tar.gz u-boot-a09fea1d28fe3c69a64bee092f5a764274d26ca2.tar.bz2 | |
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/at91sam9n12ek.h')
| -rw-r--r-- | include/configs/at91sam9n12ek.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index bc79e17..caa487b 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -85,9 +85,6 @@ #ifdef CONFIG_SPI_BOOT /* bootstrap + u-boot + env + linux in dataflash on CS0 */ -#define CONFIG_ENV_OFFSET 0x5000 -#define CONFIG_ENV_SIZE 0x3000 -#define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_BOOTCOMMAND \ "setenv bootargs ${console} ${mtdparts} ${bootargs_nand};" \ "sf probe 0; sf read 0x22000000 0x100000 0x300000; " \ @@ -96,9 +93,6 @@ #elif defined(CONFIG_NAND_BOOT) /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_OFFSET 0x140000 -#define CONFIG_ENV_OFFSET_REDUND 0x100000 -#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND \ "setenv bootargs ${console} ${mtdparts} ${bootargs_nand};" \ "nand read 0x21000000 0x180000 0x080000;" \ @@ -111,12 +105,9 @@ #ifdef CONFIG_ENV_IS_IN_MMC /* Use raw reserved sectors to save environment */ -#define CONFIG_ENV_OFFSET 0x2000 -#define CONFIG_ENV_SIZE 0x1000 #define CONFIG_SYS_MMC_ENV_DEV 0 #else /* Use file in FAT file to save environment */ -#define CONFIG_ENV_SIZE 0x4000 #endif #define CONFIG_BOOTCOMMAND \ |