[U-Boot] [PATCH 11/14] stm32mp1: Move ENV_SIZE to Kconfig

Patrice Chotard
2019-05-10T16:11:28Z

Move ENV_SIZE from include/configs/stm32mp1.h to
arch/arm/mach-stm32mp/Kconfig

Increase ENV_SIZE from 4 to 8 Ko

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---

arch/arm/mach-stm32mp/Kconfig | 3 +++
env/Kconfig | 2 +-
include/configs/stm32mp1.h | 5 -----
3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
index 73aa382..5a7f40d 100644
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -23,6 +23,9 @@ config SPL
config SYS_SOC
default "stm32mp"

+config ENV_SIZE
+ default 0x2000
+
config TARGET_STM32MP1
bool "Support stm32mp1xx"
select ARCH_SUPPORT_PSCI if !STM32MP1_TRUSTED
diff --git a/env/Kconfig b/env/Kconfig
index ca889cc..1091c89 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -464,7 +464,7 @@ config ENV_EXT4_FILE
It's a string of the EXT4 file name. This file use to store the
environment (explicit path to the file)

-if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
+if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC || ARCH_STM32MP

config ENV_OFFSET
hex "Environment Offset"
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index 254aad1..51f1736 100644
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -43,11 +43,6 @@
*/
#define CONFIG_SYS_LOAD_ADDR STM32_DDR_BASE

-/*
- * Env parameters
- */
-#define CONFIG_ENV_SIZE SZ_4K
-
/* ATAGs */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
--
1.9.1