summaryrefslogtreecommitdiff
path: root/env
diff options
context:
space:
mode:
authorPatrice Chotard <patrice.chotard@st.com>2019-05-07 11:24:02 +0200
committerPatrice Chotard <patrice.chotard@st.com>2019-06-06 17:40:13 +0200
commit208bd2b85ecce9ecf2d661f51dba682f8ce0b074 (patch)
tree980b13ddb10dab7cfb26982567c2a0b9647fff2f /env
parent7f90cd6150efd0bcf6293bbf35293d19d5e17a41 (diff)
downloadu-boot-208bd2b85ecce9ecf2d661f51dba682f8ce0b074.tar.gz
env: allow ENV_IS_NOWHERE with other storage target
Allow U-Boot to get default environment for some boot mode (USB for example), and to select storage location when it is booting from flash device; ENVL_NOWHERE is present in env_locations with other one. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Diffstat (limited to 'env')
-rw-r--r--env/Kconfig18
1 files changed, 6 insertions, 12 deletions
diff --git a/env/Kconfig b/env/Kconfig
index 1e10c7a4c4..5651685c15 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -2,18 +2,12 @@ menu "Environment"
config ENV_IS_NOWHERE
bool "Environment is not stored"
- depends on !ENV_IS_IN_EEPROM
- depends on !ENV_IS_IN_EXT4
- depends on !ENV_IS_IN_FAT
- depends on !ENV_IS_IN_FLASH
- depends on !ENV_IS_IN_MMC
- depends on !ENV_IS_IN_NAND
- depends on !ENV_IS_IN_NVRAM
- depends on !ENV_IS_IN_ONENAND
- depends on !ENV_IS_IN_REMOTE
- depends on !ENV_IS_IN_SPI_FLASH
- depends on !ENV_IS_IN_UBI
- default y
+ default y if !ENV_IS_IN_EEPROM && !ENV_IS_IN_EXT4 && \
+ !ENV_IS_IN_FAT && !ENV_IS_IN_FLASH && \
+ !ENV_IS_IN_MMC && !ENV_IS_IN_NAND && \
+ !ENV_IS_IN_NVRAM && !ENV_IS_IN_ONENAND && \
+ !ENV_IS_IN_REMOTE && !ENV_IS_IN_SPI_FLASH && \
+ !ENV_IS_IN_UBI
help
Define this if you don't want to or can't have an environment stored
on a storage medium. In this case the environment will still exist