summaryrefslogtreecommitdiff
path: root/include/configs/am335x_shc.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/am335x_shc.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/am335x_shc.h')
-rw-r--r--include/configs/am335x_shc.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 77ac3fed24..f3b7767a97 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -34,8 +34,6 @@
#define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK)
-#define CONFIG_ENV_IS_IN_MMC 1
-
/*
* in case of SD Card or Network boot we want to have a possibility to
* debrick the shc, therefore do not read environment from eMMC
@@ -289,11 +287,4 @@
#define CONFIG_SYS_I2C_SLAVE 1
#define CONFIG_SHOW_BOOT_PROGRESS
-
-#if defined CONFIG_SHC_NETBOOT
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_ENV_IS_NOWHERE
-#undef CONFIG_ENV_IS_IN_MMC
-#endif
-#endif
#endif /* ! __CONFIG_AM335X_SHC_H */