diff options
author | Tom Rini <trini@konsulko.com> | 2019-10-29 15:30:13 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-11-10 23:14:18 -0500 |
commit | 04868585da7730af6173d175ae7795c48a7e24f4 (patch) | |
tree | 912f2f57c37cbb48dae68c2013c4bf895e99864f /include/configs/dockstar.h | |
parent | a9ee9689fac60ad3175439ac4ef237116fd445f0 (diff) | |
download | u-boot-WIP/finish-env-Kconfig-migration.tar.gz |
env: Finish migration of common ENV optionsWIP/finish-env-Kconfig-migration
- Introduce CONFIG_USE_REDUND_ENV to gate redundant environment location
or not, migrate current users to it.
ONFIG_ENV_ADDR)
- On ENV_IS_IN_REMOTE, CONFIG_ENV_OFFSET is never used.
- Add ENV_ADDR question
- 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
USE_REDUND_ENV
- 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.
- In a few other places, also check for CONFIG_ENV_ADDR being non-zero
or that we don't have certain env locations in use.
- 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>
---
To do this, I used the printvars.c hack I've referenced before to have
every platform print out the values it uses, and then throw them in to
the defconfigs.
NOTE FOR STM32MP15_* BOARDS: Previously redundant environment was set
for UBI, but not SPI nor EXT4. And while EXT4 doesn't support redundant
environment, SPI does. I've put the redundant offset as the next flash
sector but I need you to ack this change or suggest a new location or go
with disabling redundant environment on UBI. Thanks!
Diffstat (limited to 'include/configs/dockstar.h')
-rw-r--r-- | include/configs/dockstar.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index f33978829d..04dd0f68c3 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -27,16 +27,10 @@ /* * Environment variables configurations */ -#ifdef CONFIG_CMD_NAND -#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ -#endif /* * max 4k env size is enough, but in case of nand * it has to be rounded to sector size */ -#define CONFIG_ENV_SIZE 0x20000 /* 128k */ -#define CONFIG_ENV_ADDR 0x80000 -#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */ /* * Default environment variables |