summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mx6
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-08-03 12:21:59 -0600
committerTom Rini <trini@konsulko.com>2017-08-15 20:50:01 -0400
commitc1c3fe23070ac924e65208abbf8d2396bcc08008 (patch)
tree29ce01ae60c101aab6b94ab40839ae061feb8f87 /arch/arm/mach-imx/mx6
parent4415f1d1f1c57d43f6bc8ff156554c2b2da45b52 (diff)
env: Convert CONFIG_ENV_IS_IN... to a choice
At present we support multiple environment drivers but there is not way to select between them at run time. Also settings related to the position and size of the environment area are global (i.e. apply to all locations). Until these limitations are removed we cannot really support more than one environment location. Adjust the location to be a choice so that only one can be selected. By default the environment is 'nowhere', meaning that the environment exists only in memory and cannot be saved. Also expand the help for the 'nowhere' option and move it to the top since it is the default. Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Move all of the imply logic to default X if Y so it works again] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/mach-imx/mx6')
-rw-r--r--arch/arm/mach-imx/mx6/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 9bae748c67..6461c88b17 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -30,7 +30,6 @@ config MX6SL
config MX6SX
select ROM_UNIFIED_SECTIONS
bool
- imply ENV_IS_IN_MMC
config MX6SLL
select ROM_UNIFIED_SECTIONS