summaryrefslogtreecommitdiff
path: root/include/configs/taurus.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-07-23 21:19:39 -0600
committerTom Rini <trini@konsulko.com>2017-07-25 21:08:01 -0400
commit2be296538e2e9d2893dc495b3fc8f9f6acb1454c (patch)
tree8e0c795c20efffb8c3e3a0cedf62a3e3d5658c2c /include/configs/taurus.h
parent5785e51940f0dd89ab372a56fc7341fdd2739277 (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/taurus.h')
-rw-r--r--include/configs/taurus.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index e03731b9b9..cdea9ebf59 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -144,7 +144,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x22000000
/* bootstrap in spi flash , u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x100000
#define CONFIG_ENV_OFFSET_REDUND 0x180000
#define CONFIG_ENV_SIZE (SZ_128K) /* 1 sector = 128 kB */