stm32mp1: Move ENV_SIZE and ENV_OFFSET to Kconfig

Add arch stm32mp for ENV migration step and drop more
items from include/configs/xxx.h.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
index 39a2a3273d919cd548d790ef96a4c3b10a93ddd5..26dace10859babff8d874abb61ae5226674bbed8 100644 (file)
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -26,6 +26,9 @@ config SYS_SOC
 config SYS_MALLOC_LEN
        default 0x2000000
 
+config ENV_SIZE
+       default 0x1000
+
 config TARGET_STM32MP1
        bool "Support stm32mp1xx"
        select ARCH_SUPPORT_PSCI if !STM32MP1_TRUSTED

diff --git a/env/Kconfig b/env/Kconfig
index 70858d3b40755196495cbcfae38c50dbe3ca0980..1e10c7a4c46b1ea0370d5d8cb5d33d105e91eb15 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -470,7 +470,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 1d825378c2f8831baa7368eb5c69a79bf8fec5ff..399b1d85c910e409b9f916725854a1304e8aee80 100644 (file)
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -38,11 +38,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