summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlgapally Santosh Sagar <[email protected]>2023-09-21 16:50:42 +0530
committerMichal Simek <[email protected]>2023-11-07 13:47:08 +0100
commit8819892bdbcfe8797bb1ebf45806d9b5ebb86674 (patch)
tree4d6a1c1c70a2534ad10b2a8e2d7343c209427efe /include
parent3af0e9556c968fc2c40e3778d8f1e668a90af92e (diff)
configs: Add support in Kconfig and convert for armada boards
Move the DEFAULT_ENV_IS_RW to Kconfig for easier configuration. Hence, add the CONFIG_DEFAULT_ENV_IS_RW config to the defconfig files to allow enabling them for armada boards. Signed-off-by: Algapally Santosh Sagar <[email protected]> Signed-off-by: Venkatesh Yadav Abbarapu <[email protected]> Reviewed-by: Simon Glass <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michal Simek <[email protected]>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mvebu_armada-37xx.h1
-rw-r--r--include/env_default.h2
-rw-r--r--include/env_internal.h2
3 files changed, 2 insertions, 3 deletions
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 76e148f55eb..18b55be0d8c 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -30,7 +30,6 @@
/*
* Environment
*/
-#define DEFAULT_ENV_IS_RW /* required for configuring default fdtfile= */
#ifdef CONFIG_MMC
#define BOOT_TARGET_DEVICES_MMC(func, i) func(MMC, mmc, i)
diff --git a/include/env_default.h b/include/env_default.h
index b16c22d5a28..227cad7c340 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -21,7 +21,7 @@ env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
{
#elif defined(DEFAULT_ENV_INSTANCE_STATIC)
static char default_environment[] = {
-#elif defined(DEFAULT_ENV_IS_RW)
+#elif defined(CONFIG_DEFAULT_ENV_IS_RW)
char default_environment[] = {
#else
const char default_environment[] = {
diff --git a/include/env_internal.h b/include/env_internal.h
index 6a694946468..fcb464263f0 100644
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -89,7 +89,7 @@ typedef struct environment_s {
extern env_t embedded_environment;
#endif /* ENV_IS_EMBEDDED */
-#ifdef DEFAULT_ENV_IS_RW
+#ifdef CONFIG_DEFAULT_ENV_IS_RW
extern char default_environment[];
#else
extern const char default_environment[];