[U-Boot] [PATCH v2 07/34] Convert CONFIG_ENV_IS_IN_NVRAM to Kconfig

Simon Glass
2017-07-24T03:19:42Z

This converts the following to Kconfig:
CONFIG_ENV_IS_IN_NVRAM

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

README | 14 --------------
configs/highbank_defconfig | 3 ++-
env/Kconfig | 15 +++++++++++++++
include/configs/M54418TWR.h | 1 -
include/configs/highbank.h | 1 -
scripts/config_whitelist.txt | 2 --
6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/README b/README
index caf35a10b2..05a4fcf4b5 100644
--- a/README
+++ b/README
@@ -3432,20 +3432,6 @@ following configurations:
Builds up envcrc with the target environment so that external utils
may easily extract it and embed it in final U-Boot images.

-- CONFIG_ENV_IS_IN_NVRAM:
-
- Define this if you have some non-volatile memory device
- (NVRAM, battery buffered SRAM) which you want to use for the
- environment.
-
- - CONFIG_ENV_ADDR:
- - CONFIG_ENV_SIZE:
-
- These two #defines are used to determine the memory area you
- want to use for environment. It is assumed that this memory
- can just be read and written to, without any special
- provision.
-
BE CAREFUL! The first access to the environment happens quite early
in U-Boot initialization (when we try to get the setting of for the
console baudrate). You *MUST* have mapped your NVRAM area then, or
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index 6f19492251..552bdcffad 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_ISO_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_PARTITION_UUIDS is not set
-CONFIG_SCSI=y
+CONFIG_ENV_IS_IN_NVRAM=y
# CONFIG_MMC is not set
+CONFIG_SCSI=y
CONFIG_OF_LIBFDT=y
diff --git a/env/Kconfig b/env/Kconfig
index 5cc55f8972..75dd57843f 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -161,6 +161,21 @@ config ENV_IS_IN_NAND
Currently, CONFIG_ENV_OFFSET_REDUND is not supported when
using CONFIG_ENV_OFFSET_OOB.

+config ENV_IS_IN_NVRAM
+ bool "Environment in a non-volatile RAM"
+ help
+ Define this if you have some non-volatile memory device
+ (NVRAM, battery buffered SRAM) which you want to use for the
+ environment.
+
+ - CONFIG_ENV_ADDR:
+ - CONFIG_ENV_SIZE:
+
+ These two #defines are used to determine the memory area 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_UBI
bool "Environment in a UBI volume"
help
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 985df810cb..db40b426a8 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -273,7 +273,6 @@
* Environment is embedded in u-boot in the second sector of the flash
*/
#if !defined(CONFIG_SERIAL_BOOT) /*MRAM boot*/
-#define CONFIG_ENV_IS_IN_MRAM 1
#define CONFIG_ENV_ADDR (0x40000 - 0x1000) /*MRAM size 40000*/
#define CONFIG_ENV_SIZE 0x1000
#endif
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 533d3e3f82..0328c4100b 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -74,7 +74,6 @@

/* Environment data setup
*/
-#define CONFIG_ENV_IS_IN_NVRAM
#define CONFIG_SYS_NVRAM_BASE_ADDR 0xfff88000 /* NVRAM base address */
#define CONFIG_SYS_NVRAM_SIZE 0x8000 /* NVRAM size */
#define CONFIG_ENV_SIZE 0x2000 /* Size of Environ */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2c7ea85618..e4d434b73b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -636,8 +636,6 @@ CONFIG_ENV_IS_IN_
CONFIG_ENV_IS_IN_DATAFLASH
CONFIG_ENV_IS_IN_EEPROM
CONFIG_ENV_IS_IN_FAT
-CONFIG_ENV_IS_IN_MRAM
-CONFIG_ENV_IS_IN_NVRAM
CONFIG_ENV_IS_IN_ONENAND
CONFIG_ENV_IS_IN_REMOTE
CONFIG_ENV_IS_IN_SPI_FLASH
--
2.14.0.rc0.284.gd933b75aa4-goog