diff options
author | Simon Glass <sjg@chromium.org> | 2017-07-24 06:19:39 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-07-26 04:08:01 +0300 |
commit | 2be296538e2e9d2893dc495b3fc8f9f6acb1454c (patch) | |
tree | 8e0c795c20efffb8c3e3a0cedf62a3e3d5658c2c /include/configs/T4240RDB.h | |
parent | 5785e51940f0dd89ab372a56fc7341fdd2739277 (diff) | |
download | u-boot-2be296538e2e9d2893dc495b3fc8f9f6acb1454c.tar.xz |
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/T4240RDB.h')
-rw-r--r-- | include/configs/T4240RDB.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index ed3b0f7202..d06c5b574e 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -319,9 +319,6 @@ "bootm 0x01000000 - 0x00f00000" #ifndef CONFIG_MTD_NOR_FLASH -#ifndef CONFIG_RAMBOOT_PBL -#define CONFIG_ENV_IS_NOWHERE -#endif #else #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -340,13 +337,11 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (512 * 0x800) #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_ENV_IS_NOWHERE) |