Skip to contentSkip to conversation

stm32mp1: move CONFIG_ENV in Kconfig

PATCH New Patrick Delaunay 1 participant 5 messages Jun 14, 2019 – Jul 12, 2019 Arm STM32

lore
Share & tools
lore
#0 lore raw

cover stm32mp1: move CONFIG_ENV in Kconfig

Hi,

This serie moves the remaining CONFIG_ENV_ flags
for the the stm32m1 arch or board in Kconfig.

No impact for other target, checked by tools/buildman/buildman -D rockchip sunxi zynq versal arc stm32mp

Patrick Delaunay (2):
env: Move CONFIG_ENV_UBI_VOLUME_REDUND in Kconfig
stm32mp1: move CONFIG_ENV in Kconfig

 board/st/stm32mp1/Kconfig           |  6 ++++++
 configs/stm32mp15_basic_defconfig   |  2 ++
 configs/stm32mp15_trusted_defconfig |  2 ++
 env/Kconfig                         | 16 +++++++++++++---
 include/configs/stm32mp1.h          |  9 ---------
 5 files changed, 23 insertions(+), 12 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/2 env: Move CONFIG_ENV_UBI_VOLUME_REDUND in Kconfig

Add support of CONFIG_ENV_UBI_VOLUME_REDUND in Kconfig as it is already done for CONFIG_ENV_UBI_VOLUME.

As this string is optional, the patch introduces the new boolean option CONFIG_USE_ENV_UBI_VOLUME_REDUND to activate the feature.

Only the stm32mp1 board is impacted.

---

 configs/stm32mp15_basic_defconfig   |  2 ++
 configs/stm32mp15_trusted_defconfig |  2 ++
 env/Kconfig                         | 11 +++++++++++
 include/configs/stm32mp1.h          |  4 ----
 4 files changed, 15 insertions(+), 4 deletions(-)
configs/stm32mp15_basic_defconfig +2 -0
index 4aa184f..f4b42eb 100644
@@ -52,6 +52,8 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
 CONFIG_ENV_EXT4_FILE="/uboot.env"
 CONFIG_ENV_UBI_PART="UBI"
 CONFIG_ENV_UBI_VOLUME="uboot_config"
+CONFIG_USE_ENV_UBI_VOLUME_REDUND=y
+CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r"
 CONFIG_STM32_ADC=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
configs/stm32mp15_trusted_defconfig +2 -0
index 66361c8..91b450c 100644
@@ -44,6 +44,8 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
 CONFIG_ENV_EXT4_FILE="/uboot.env"
 CONFIG_ENV_UBI_PART="UBI"
 CONFIG_ENV_UBI_VOLUME="uboot_config"
+CONFIG_USE_ENV_UBI_VOLUME_REDUND=y
+CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r"
 CONFIG_STM32_ADC=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
env/Kconfig +11 -0
index 5651685..676d6eb 100644
@@ -507,6 +507,17 @@ config ENV_UBI_VOLUME
 	help
 	  Name of the volume that you want to store the environment in.
 
+config USE_ENV_UBI_VOLUME_REDUND
+	bool "Enable redunbant UBI volume"
+	depends on ENV_IS_IN_UBI
+
+config ENV_UBI_VOLUME_REDUND
+	string "UBI volume name, second copy"
+	depends on USE_ENV_UBI_VOLUME_REDUND
+	help
+	  Name of the second volume that you want to store the redundant
+	  environment in.
+
 endif
 
 config USE_DEFAULT_ENV_FILE
include/configs/stm32mp1.h +0 -4
index 1d385e0..0ce2fcb 100644
@@ -38,10 +38,6 @@
  */
 #define CONFIG_SYS_LOAD_ADDR			STM32_DDR_BASE
 
-#if defined(CONFIG_ENV_IS_IN_UBI)
-#define CONFIG_ENV_UBI_VOLUME_REDUND		"uboot_config_r"
-#endif
-
 #if defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 #define	CONFIG_ENV_SECT_SIZE			SZ_256K
 #define	CONFIG_ENV_OFFSET			0x00280000
Signature · 1 line
2.7.4
#2 lore raw

PATCH 1/2 env: Move CONFIG_ENV_UBI_VOLUME_REDUND in Kconfig

Hi,

Quoted 14 lines

From: Patrick DELAUNAY <[email protected]>
Sent: vendredi 14 juin 2019 13:06
<[email protected]>; Michal Simek <[email protected]>; York Sun <[email protected]>; U-Boot STM32 <uboot-stm32@st-md- mailman.stormreply.com>; Vipul Kumar <[email protected]>; Patrice CHOTARD <[email protected]>; Heinrich Schuchardt <[email protected]>; Alexey Brodkin <[email protected]>
Subject: [PATCH 1/2] env: Move CONFIG_ENV_UBI_VOLUME_REDUND in Kconfig
Importance: High

Add support of CONFIG_ENV_UBI_VOLUME_REDUND in Kconfig as it is already done for CONFIG_ENV_UBI_VOLUME.

Quoted 6 lines

As this string is optional, the patch introduces the new boolean option CONFIG_USE_ENV_UBI_VOLUME_REDUND to activate the feature.

Only the stm32mp1 board is impacted.

I drop this patch as it is superseded by http://patchwork.ozlabs.org/patch/1100049/

Merged in SHA1 ff4818cc3ec105a5a250188e6914ae233b75aa84

PS: USE_ENV_UBI_VOLUME_REDUND is no more needed in this patchset

Patrick

Quoted 75 lines

---

 configs/stm32mp15_basic_defconfig   |  2 ++
 configs/stm32mp15_trusted_defconfig |  2 ++
 env/Kconfig                         | 11 +++++++++++
 include/configs/stm32mp1.h          |  4 ----
 4 files changed, 15 insertions(+), 4 deletions(-)
configs/stm32mp15_basic_defconfig +2 -0
index 4aa184f..f4b42eb 100644
@@ -52,6 +52,8 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
 CONFIG_ENV_EXT4_FILE="/uboot.env"
 CONFIG_ENV_UBI_PART="UBI"
 CONFIG_ENV_UBI_VOLUME="uboot_config"
+CONFIG_USE_ENV_UBI_VOLUME_REDUND=y
+CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r"
 CONFIG_STM32_ADC=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
configs/stm32mp15_trusted_defconfig +2 -0
index 66361c8..91b450c 100644
@@ -44,6 +44,8 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
 CONFIG_ENV_EXT4_FILE="/uboot.env"
 CONFIG_ENV_UBI_PART="UBI"
 CONFIG_ENV_UBI_VOLUME="uboot_config"
+CONFIG_USE_ENV_UBI_VOLUME_REDUND=y
+CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r"
 CONFIG_STM32_ADC=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
env/Kconfig +11 -0
index 5651685..676d6eb 100644
@@ -507,6 +507,17 @@ config ENV_UBI_VOLUME
 	help
 	  Name of the volume that you want to store the environment in.
 
+config USE_ENV_UBI_VOLUME_REDUND
+	bool "Enable redunbant UBI volume"
+	depends on ENV_IS_IN_UBI
+
+config ENV_UBI_VOLUME_REDUND
+	string "UBI volume name, second copy"
+	depends on USE_ENV_UBI_VOLUME_REDUND
+	help
+	  Name of the second volume that you want to store the redundant
+	  environment in.
+
 endif
 
 config USE_DEFAULT_ENV_FILE
include/configs/stm32mp1.h index renamed from include/configs/stm32mp1.h +0 -0

1d385e0..0ce2fcb 100644

include/configs/stm32mp1.h +0 -5
@@ -38,10 +38,6 @@
  */
 #define CONFIG_SYS_LOAD_ADDR			STM32_DDR_BASE
 
-#if defined(CONFIG_ENV_IS_IN_UBI)
-#define CONFIG_ENV_UBI_VOLUME_REDUND		"uboot_config_r"
-#endif
-
 #if defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 #define	CONFIG_ENV_SECT_SIZE			SZ_256K
 #define	CONFIG_ENV_OFFSET			0x00280000
--

2.7.4

#3 lore raw

PATCH 2/2 stm32mp1: move CONFIG_ENV in Kconfig

In reply to Patrick Delaunay

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

---

 board/st/stm32mp1/Kconfig  | 6 ++++++
 env/Kconfig                | 5 ++---
 include/configs/stm32mp1.h | 5 -----
 3 files changed, 8 insertions(+), 8 deletions(-)
board/st/stm32mp1/Kconfig +6 -0
index 5ab9415..5f81f94 100644
@@ -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
env/Kconfig +2 -3
index 676d6eb..e03ec32 100644
@@ -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
@@ -489,7 +488,7 @@ config ENV_SIZE
 
 config ENV_SECT_SIZE
 	hex "Environment Sector-Size"
-	depends on !ENV_IS_NOWHERE && (ARCH_ZYNQ || ARCH_ZYNQMP)
+	depends on (!ENV_IS_NOWHERE && (ARCH_ZYNQ || ARCH_ZYNQMP)) || ARCH_STM32MP
 	default 0x40000 if ARCH_ZYNQMP
 	default 0x20000 if ARCH_ZYNQ
 	help
include/configs/stm32mp1.h +0 -5
index 0ce2fcb..637f9bf 100644
@@ -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
Signature · 1 line
2.7.4
#4 lore raw

PATCH 2/2 stm32mp1: move CONFIG_ENV in Kconfig

Hi,

Quoted 7 lines

From: Patrick DELAUNAY <[email protected]>
Sent: vendredi 14 juin 2019 13:06

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

Quoted 8 lines

---

 board/st/stm32mp1/Kconfig  | 6 ++++++
 env/Kconfig                | 5 ++---
 include/configs/stm32mp1.h | 5 -----
 3 files changed, 8 insertions(+), 8 deletions(-)

Applied to u-boot-stm32/master, thanks!

Patrick