From 609bf924117950b88987a5fa477acf1239bfdbc1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 23 Jul 2017 21:19:48 -0600 Subject: [PATCH] Convert CONFIG_ENV_IS_IN_ONENAND to Kconfig This converts the following to Kconfig: CONFIG_ENV_IS_IN_ONENAND Signed-off-by: Simon Glass --- common/Kconfig | 15 +++++++++++++++ configs/smdkc100_defconfig | 1 + configs/vct_platinum_onenand_defconfig | 1 + configs/vct_platinum_onenand_small_defconfig | 1 + configs/vct_platinumavc_onenand_defconfig | 1 + configs/vct_platinumavc_onenand_small_defconfig | 1 + configs/vct_premium_onenand_defconfig | 1 + configs/vct_premium_onenand_small_defconfig | 1 + include/configs/omap3_evm.h | 1 - include/configs/smdkc100.h | 1 - include/configs/vct.h | 1 - scripts/config_whitelist.txt | 1 - 12 files changed, 22 insertions(+), 4 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index abf55e5156..8c8d2e4832 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -466,6 +466,21 @@ config ENV_IS_IN_NVRAM can just be read and written to, without any special provision. +config ENV_IS_IN_ONENAND + bool "Environment is in OneNAND" + depends on !CHAIN_OF_TRUST + help + Define this if you want to put your local device's environment in + OneNAND. + + - CONFIG_ENV_ADDR: + - CONFIG_ENV_SIZE: + + These two #defines are used to determine the device range you + want to use for environment. It is assumed that this memory + can just be read and written to, without any special + provision. + config ENV_IS_IN_REMOTE bool "Environment is in remove memory space" depends on !CHAIN_OF_TRUST diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig index a1eca8694d..ef8510d47d 100644 --- a/configs/smdkc100_defconfig +++ b/configs/smdkc100_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_S5PC1XX=y CONFIG_TARGET_SMDKC100=y CONFIG_IDENT_STRING=" for SMDKC100" CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100" +CONFIG_ENV_IS_IN_ONENAND=y CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="SMDKC100 # " diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig index 9f2d78f621..4c1615c537 100644 --- a/configs/vct_platinum_onenand_defconfig +++ b/configs/vct_platinum_onenand_defconfig @@ -2,6 +2,7 @@ CONFIG_MIPS=y CONFIG_TARGET_VCT=y CONFIG_VCT_PLATINUM=y CONFIG_VCT_ONENAND=y +CONFIG_ENV_IS_IN_ONENAND=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig index 93e5b55b1f..20c0863b7b 100644 --- a/configs/vct_platinum_onenand_small_defconfig +++ b/configs/vct_platinum_onenand_small_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y CONFIG_VCT_PLATINUM=y CONFIG_VCT_ONENAND=y CONFIG_VCT_SMALL_IMAGE=y +CONFIG_ENV_IS_IN_ONENAND=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig index c3abc5eae4..dfb8f04ce7 100644 --- a/configs/vct_platinumavc_onenand_defconfig +++ b/configs/vct_platinumavc_onenand_defconfig @@ -2,6 +2,7 @@ CONFIG_MIPS=y CONFIG_TARGET_VCT=y CONFIG_VCT_PLATINUMAVC=y CONFIG_VCT_ONENAND=y +CONFIG_ENV_IS_IN_ONENAND=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig index d3351e8abd..de7b500f80 100644 --- a/configs/vct_platinumavc_onenand_small_defconfig +++ b/configs/vct_platinumavc_onenand_small_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y CONFIG_VCT_PLATINUMAVC=y CONFIG_VCT_ONENAND=y CONFIG_VCT_SMALL_IMAGE=y +CONFIG_ENV_IS_IN_ONENAND=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig index a944c82ceb..ba43e0e00a 100644 --- a/configs/vct_premium_onenand_defconfig +++ b/configs/vct_premium_onenand_defconfig @@ -2,6 +2,7 @@ CONFIG_MIPS=y CONFIG_TARGET_VCT=y CONFIG_VCT_PREMIUM=y CONFIG_VCT_ONENAND=y +CONFIG_ENV_IS_IN_ONENAND=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig index 77e408b41d..cc9998f391 100644 --- a/configs/vct_premium_onenand_small_defconfig +++ b/configs/vct_premium_onenand_small_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y CONFIG_VCT_PREMIUM=y CONFIG_VCT_ONENAND=y CONFIG_VCT_SMALL_IMAGE=y +CONFIG_ENV_IS_IN_ONENAND=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 76c00d4efa..15eb08bba8 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -267,7 +267,6 @@ #if !defined(CONFIG_ENV_IS_NOWHERE) #if defined(CONFIG_CMD_NAND) #elif defined(CONFIG_CMD_ONENAND) -#define CONFIG_ENV_IS_IN_ONENAND #define CONFIG_ENV_OFFSET ONENAND_ENV_OFFSET #endif #endif /* CONFIG_ENV_IS_NOWHERE */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index dded4d4bf9..14b49c4faf 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -174,7 +174,6 @@ /*----------------------------------------------------------------------- * Boot configuration */ -#define CONFIG_ENV_IS_IN_ONENAND 1 #define CONFIG_ENV_SIZE (128 << 10) /* 128KiB, 0x20000 */ #define CONFIG_ENV_ADDR (256 << 10) /* 256KiB, 0x40000 */ #define CONFIG_ENV_OFFSET (256 << 10) /* 256KiB, 0x40000 */ diff --git a/include/configs/vct.h b/include/configs/vct.h index 5a62e3fb82..f3c6c27696 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -183,7 +183,6 @@ #if defined(CONFIG_VCT_ONENAND) #define CONFIG_USE_ONENAND_BOARD_INIT -#define CONFIG_ENV_IS_IN_ONENAND #define CONFIG_SYS_ONENAND_BASE 0x00000000 /* this is not real address */ #define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_ENV_ADDR (128 << 10) /* after compr. U-Boot image */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 721a638d53..93f0bf47c6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -633,7 +633,6 @@ CONFIG_ENV_FLAGS_LIST_STATIC CONFIG_ENV_FLASHBOOT CONFIG_ENV_IS_EMBEDDED CONFIG_ENV_IS_IN_ -CONFIG_ENV_IS_IN_ONENAND CONFIG_ENV_MAX_ENTRIES CONFIG_ENV_MIN_ENTRIES CONFIG_ENV_OFFSET_OOB -- 2.30.2