diff options
author | Simon Glass <sjg@chromium.org> | 2017-07-23 21:19:39 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-07-25 21:08:01 -0400 |
commit | 2be296538e2e9d2893dc495b3fc8f9f6acb1454c (patch) | |
tree | 8e0c795c20efffb8c3e3a0cedf62a3e3d5658c2c /include/configs/at91sam9rlek.h | |
parent | 5785e51940f0dd89ab372a56fc7341fdd2739277 (diff) |
Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig
This converts the following to Kconfig:
CONFIG_ENV_IS_IN_MMC
CONFIG_ENV_IS_IN_NAND
CONFIG_ENV_IS_IN_UBI
CONFIG_ENV_IS_NOWHERE
In fact this already exists for sunxi as a 'choice' config. However not
all the choices are available in Kconfig yet so we cannot use that. It
would lead to more than one option being set.
In addition, one purpose of this series is to allow the environment to be
stored in more than one place. So the existing choice is converted to a
normal config allowing each option to be set independently.
There are not many opportunities for Kconfig updates to reduce the size of
this patch. This was tested with
./tools/moveconfig.py -i CONFIG_ENV_IS_IN_MMC
And then manual updates. This is because for CHAIN_OF_TRUST boards they
can only have ENV_IS_NOWHERE set, so we enforce that via Kconfig logic
now.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/at91sam9rlek.h')
-rw-r--r-- | include/configs/at91sam9rlek.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 8a8eb7c34f..05ba542382 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -109,7 +109,6 @@ #elif CONFIG_SYS_USE_NANDFLASH /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_OFFSET 0x120000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ |