[U-Boot] [PATCH 1/2] env: Move CONFIG_ENV_UBI_VOLUME_REDUND in Kconfig

[Patrick DELAUNAY]

Hi,

> From: Patrick DELAUNAY <patrick.delaunay at st.com>
> Sent: vendredi 14 juin 2019 13:06
> <marek.vasut at gmail.com>; Michal Simek <michal.simek at xilinx.com>; York Sun
> <york.sun at nxp.com>; U-Boot STM32 <uboot-stm32 at st-md-
> mailman.stormreply.com>; Vipul Kumar <vipul.kumar at xilinx.com>; Patrice
> CHOTARD <patrice.chotard at st.com>; Heinrich Schuchardt
> <xypron.glpk at gmx.de>; Alexey Brodkin <abrodkin at synopsys.com>
> 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.
> 
> 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.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>

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

> ---
> 
>  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(-)
> 
> diff --git a/configs/stm32mp15_basic_defconfig
> b/configs/stm32mp15_basic_defconfig
> index 4aa184f..f4b42eb 100644
> --- a/configs/stm32mp15_basic_defconfig
> +++ b/configs/stm32mp15_basic_defconfig
> @@ -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
> diff --git a/configs/stm32mp15_trusted_defconfig
> b/configs/stm32mp15_trusted_defconfig
> index 66361c8..91b450c 100644
> --- a/configs/stm32mp15_trusted_defconfig
> +++ b/configs/stm32mp15_trusted_defconfig
> @@ -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
> diff --git a/env/Kconfig b/env/Kconfig
> index 5651685..676d6eb 100644
> --- a/env/Kconfig
> +++ b/env/Kconfig
> @@ -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
> diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index
> 1d385e0..0ce2fcb 100644
> --- a/include/configs/stm32mp1.h
> +++ b/include/configs/stm32mp1.h
> @@ -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