stm32mp1: move CONFIG_ENV in Kconfig

Move 2 ENV configuration flags in board Kconfig
- CONFIG_ENV_SECT_SIZE
- CONFIG_ENV_OFFSET

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

diff --git a/board/st/stm32mp1/Kconfig b/board/st/stm32mp1/Kconfig
index 5ab94151a9aa7fa285a6d9dae7673f825f4a6b59..5f81f942a0825f3de3c9e5e53f51df1673ea29d4 100644 (file)
--- a/board/st/stm32mp1/Kconfig
+++ b/board/st/stm32mp1/Kconfig
@@ -9,4 +9,10 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "stm32mp1"
 
+config ENV_SECT_SIZE
+       default 0x40000 if ENV_IS_IN_SPI_FLASH
+
+config ENV_OFFSET
+       default 0x280000 if ENV_IS_IN_SPI_FLASH
+
 endif

diff --git a/env/Kconfig b/env/Kconfig
index d86a9bfa308cadb887278b3184442ce7cb9837a2..74db2f38cc1906bb4d74dad4ecd812c1897fd738 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -468,8 +468,7 @@ if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
 
 config ENV_OFFSET
        hex "Environment Offset"
-       depends on !ENV_IS_IN_UBI
-       depends on !ENV_IS_NOWHERE
+       depends on (!ENV_IS_IN_UBI && !ENV_IS_NOWHERE) || ARCH_STM32MP
        default 0x3f8000 if ARCH_ROCKCHIP
        default 0x88000 if ARCH_SUNXI
        default 0xE0000 if ARCH_ZYNQ
@@ -492,7 +491,7 @@ config ENV_SIZE
 
 config ENV_SECT_SIZE
        hex "Environment Sector-Size"
-       depends on !ENV_IS_NOWHERE && (ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_OMAP2PLUS || ARCH_AT91)
+       depends on (!ENV_IS_NOWHERE && (ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_OMAP2PLUS || ARCH_AT91) )|| ARCH_STM32MP
        default 0x40000 if ARCH_ZYNQMP
        default 0x20000 if ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91
        help

diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index 0ce2fcb8b7a23842da9111f8b390ec21bf98413a..637f9bf5b0239ecaed66fc09e0126be510b7fcdf 100644 (file)
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -38,11 +38,6 @@
  */
 #define CONFIG_SYS_LOAD_ADDR                   STM32_DDR_BASE
 
-#if defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define        CONFIG_ENV_SECT_SIZE                    SZ_256K
-#define        CONFIG_ENV_OFFSET                       0x00280000
-#endif
-
 /* ATAGs */
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS