[Uboot-stm32] [PATCH 2/2] configs: migrate CONFIG_SYS_MTDPARTS_RUNTIME to defconfigs

[Patrice CHOTARD]

HI

On 2/26/20 10:28 AM, Patrick Delaunay wrote:
> Move CONFIG_SYS_MTDPARTS_RUNTIME into Kconfig done by moveconfig.py.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
> ---
>
>  configs/igep00x0_defconfig              | 1 +
>  configs/stm32mp15_basic_defconfig       | 1 +
>  configs/stm32mp15_dhcom_basic_defconfig | 1 +
>  configs/stm32mp15_optee_defconfig       | 1 +
>  configs/stm32mp15_trusted_defconfig     | 1 +
>  drivers/mtd/Kconfig                     | 7 +++++++
>  include/configs/omap3_igep00x0.h        | 2 --
>  include/configs/stm32mp1.h              | 5 -----
>  scripts/config_whitelist.txt            | 1 -
>  9 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
> index e273f35e84..a5c301dbdb 100644
> --- a/configs/igep00x0_defconfig
> +++ b/configs/igep00x0_defconfig
> @@ -52,6 +52,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
>  CONFIG_DM_MMC=y
>  CONFIG_MMC_OMAP_HS=y
>  CONFIG_MTD=y
> +CONFIG_SYS_MTDPARTS_RUNTIME=y
>  CONFIG_MTD_RAW_NAND=y
>  CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
>  CONFIG_SPL_NAND_SIMPLE=y
> diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
> index 4efb1bf9c2..85d0cd2b69 100644
> --- a/configs/stm32mp15_basic_defconfig
> +++ b/configs/stm32mp15_basic_defconfig
> @@ -91,6 +91,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_STM32_SDMMC2=y
>  CONFIG_MTD=y
>  CONFIG_DM_MTD=y
> +CONFIG_SYS_MTDPARTS_RUNTIME=y
>  CONFIG_MTD_RAW_NAND=y
>  CONFIG_NAND_STM32_FMC2=y
>  CONFIG_MTD_SPI_NAND=y
> diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
> index 9b5e54748d..3b955cb8e6 100644
> --- a/configs/stm32mp15_dhcom_basic_defconfig
> +++ b/configs/stm32mp15_dhcom_basic_defconfig
> @@ -84,6 +84,7 @@ CONFIG_DM_MMC=y
>  CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_STM32_SDMMC2=y
>  CONFIG_MTD=y
> +CONFIG_SYS_MTDPARTS_RUNTIME=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH_MACRONIX=y
>  CONFIG_SPI_FLASH_SPANSION=y
> diff --git a/configs/stm32mp15_optee_defconfig b/configs/stm32mp15_optee_defconfig
> index 54135b28aa..771381a7ad 100644
> --- a/configs/stm32mp15_optee_defconfig
> +++ b/configs/stm32mp15_optee_defconfig
> @@ -78,6 +78,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_STM32_SDMMC2=y
>  CONFIG_MTD=y
>  CONFIG_DM_MTD=y
> +CONFIG_SYS_MTDPARTS_RUNTIME=y
>  CONFIG_MTD_RAW_NAND=y
>  CONFIG_NAND_STM32_FMC2=y
>  CONFIG_MTD_SPI_NAND=y
> diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
> index d7d0b6c296..d777978197 100644
> --- a/configs/stm32mp15_trusted_defconfig
> +++ b/configs/stm32mp15_trusted_defconfig
> @@ -77,6 +77,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_STM32_SDMMC2=y
>  CONFIG_MTD=y
>  CONFIG_DM_MTD=y
> +CONFIG_SYS_MTDPARTS_RUNTIME=y
>  CONFIG_MTD_RAW_NAND=y
>  CONFIG_NAND_STM32_FMC2=y
>  CONFIG_MTD_SPI_NAND=y
> diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
> index 5e7571cf3d..348b43e653 100644
> --- a/drivers/mtd/Kconfig
> +++ b/drivers/mtd/Kconfig
> @@ -22,6 +22,13 @@ config MTD_NOR_FLASH
>  	help
>  	  Enable support for parallel NOR flash.
>  
> +config SYS_MTDPARTS_RUNTIME
> +	bool "Allow MTDPARTS to be configured at runtime"
> +	depends on MTD
> +	help
> +	  This option allows to call the function board_mtdparts_default to
> +	  dynamically build the variables mtdids and mtdparts at runtime.
> +
>  config FLASH_CFI_DRIVER
>  	bool "Enable CFI Flash driver"
>  	help
> diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
> index 4ad7dc18b1..8dc30be8b7 100644
> --- a/include/configs/omap3_igep00x0.h
> +++ b/include/configs/omap3_igep00x0.h
> @@ -71,8 +71,6 @@
>  
>  #endif
>  
> -#define CONFIG_SYS_MTDPARTS_RUNTIME
> -
>  /* OneNAND config */
>  #define CONFIG_USE_ONENAND_BOARD_INIT
>  #define CONFIG_SYS_ONENAND_BASE		ONENAND_MAP
> diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
> index 592638072a..f451edad36 100644
> --- a/include/configs/stm32mp1.h
> +++ b/include/configs/stm32mp1.h
> @@ -85,11 +85,6 @@
>  #define CONFIG_SYS_AUTOLOAD		"no"
>  #endif
>  
> -/* Dynamic MTD partition support */
> -#if defined(CONFIG_STM32_QSPI) || defined(CONFIG_NAND_STM32_FMC2)
> -#define CONFIG_SYS_MTDPARTS_RUNTIME
> -#endif
> -
>  #ifdef CONFIG_DM_VIDEO
>  #define CONFIG_VIDEO_BMP_RLE8
>  #define CONFIG_BMP_16BPP
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 85d55b182e..7c282cc976 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -3198,7 +3198,6 @@ CONFIG_SYS_MRAM_SIZE
>  CONFIG_SYS_MSC0_VAL
>  CONFIG_SYS_MSC1_VAL
>  CONFIG_SYS_MSC2_VAL
> -CONFIG_SYS_MTDPARTS_RUNTIME
>  CONFIG_SYS_MX5_CLK32
>  CONFIG_SYS_MX5_HCLK
>  CONFIG_SYS_MX6_CLK32

Reviewed-by: Patrice Chotard <patrice.chotard at st.com>

Thanks