From 2be296538e2e9d2893dc495b3fc8f9f6acb1454c Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 23 Jul 2017 21:19:39 -0600 Subject: 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 Signed-off-by: Tom Rini --- configs/spear320_usbtty_nand_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs/spear320_usbtty_nand_defconfig') diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig index a346084c58..b055fce816 100644 --- a/configs/spear320_usbtty_nand_defconfig +++ b/configs/spear320_usbtty_nand_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR320=y CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,NAND" +CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set -- cgit