[PATCH] Convert CONFIG_STM32_FLASH to Kconfig

[Patrice CHOTARD]

Hi Patrick

On 10/4/21 11:05 AM, Patrick Delaunay wrote:
> This converts the CONFIG_STM32_FLASH to Kconfig by using
> tools/moveconfig.py
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
>  configs/stm32f429-discovery_defconfig  | 1 +
>  configs/stm32f429-evaluation_defconfig | 1 +
>  configs/stm32f469-discovery_defconfig  | 1 +
>  configs/stm32f746-disco_defconfig      | 1 +
>  configs/stm32f769-disco_defconfig      | 1 +
>  drivers/mtd/Kconfig                    | 7 +++++++
>  include/configs/stm32f429-discovery.h  | 2 --
>  include/configs/stm32f429-evaluation.h | 2 --
>  include/configs/stm32f469-discovery.h  | 2 --
>  include/configs/stm32f746-disco.h      | 2 --
>  scripts/config_whitelist.txt           | 1 -
>  11 files changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
> index b6388cf00a..ed96c370d5 100644
> --- a/configs/stm32f429-discovery_defconfig
> +++ b/configs/stm32f429-discovery_defconfig
> @@ -28,3 +28,4 @@ CONFIG_ENV_ADDR=0x8040000
>  # CONFIG_NET is not set
>  # CONFIG_MMC is not set
>  CONFIG_MTD_NOR_FLASH=y
> +CONFIG_STM32_FLASH=y
> diff --git a/configs/stm32f429-evaluation_defconfig b/configs/stm32f429-evaluation_defconfig
> index a75c269d9b..9cbd56c41e 100644
> --- a/configs/stm32f429-evaluation_defconfig
> +++ b/configs/stm32f429-evaluation_defconfig
> @@ -28,3 +28,4 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>  # CONFIG_NET is not set
>  CONFIG_ARM_PL180_MMCI=y
>  CONFIG_MTD_NOR_FLASH=y
> +CONFIG_STM32_FLASH=y
> diff --git a/configs/stm32f469-discovery_defconfig b/configs/stm32f469-discovery_defconfig
> index ecca110850..85639e2a48 100644
> --- a/configs/stm32f469-discovery_defconfig
> +++ b/configs/stm32f469-discovery_defconfig
> @@ -30,6 +30,7 @@ CONFIG_ARM_PL180_MMCI=y
>  CONFIG_MTD=y
>  CONFIG_DM_MTD=y
>  CONFIG_MTD_NOR_FLASH=y
> +CONFIG_STM32_FLASH=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH_STMICRO=y
>  # CONFIG_PINCTRL_FULL is not set
> diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig
> index 2694a32f7d..e5e7ef798c 100644
> --- a/configs/stm32f746-disco_defconfig
> +++ b/configs/stm32f746-disco_defconfig
> @@ -45,6 +45,7 @@ CONFIG_ARM_PL180_MMCI=y
>  CONFIG_MTD=y
>  CONFIG_DM_MTD=y
>  CONFIG_MTD_NOR_FLASH=y
> +CONFIG_STM32_FLASH=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH_MACRONIX=y
>  CONFIG_SPI_FLASH_STMICRO=y
> diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig
> index 10af638840..bb122d691d 100644
> --- a/configs/stm32f769-disco_defconfig
> +++ b/configs/stm32f769-disco_defconfig
> @@ -44,6 +44,7 @@ CONFIG_ARM_PL180_MMCI=y
>  CONFIG_MTD=y
>  CONFIG_DM_MTD=y
>  CONFIG_MTD_NOR_FLASH=y
> +CONFIG_STM32_FLASH=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH_MACRONIX=y
>  CONFIG_SPI_FLASH_STMICRO=y
> diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
> index b303fabe0f..ed69ea114e 100644
> --- a/drivers/mtd/Kconfig
> +++ b/drivers/mtd/Kconfig
> @@ -109,6 +109,13 @@ config HBMC_AM654
>  	 This is the driver for HyperBus controller on TI's AM65x and
>  	 other SoCs
>  
> +config STM32_FLASH
> +	bool "STM32 MCU Flash driver"
> +	depends on ARCH_STM32
> +	help
> +	 This is the driver of embedded flash for some STMicroelectronics
> +	 STM32 MCU.
> +
>  source "drivers/mtd/nand/Kconfig"
>  
>  source "drivers/mtd/spi/Kconfig"
> diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
> index 525a5277d8..ef9525574d 100644
> --- a/include/configs/stm32f429-discovery.h
> +++ b/include/configs/stm32f429-discovery.h
> @@ -21,8 +21,6 @@
>  #define CONFIG_RED_LED			110
>  #define CONFIG_GREEN_LED		109
>  
> -#define CONFIG_STM32_FLASH
> -
>  #define CONFIG_SYS_HZ_CLOCK		1000000	/* Timer is clocked at 1MHz */
>  
>  #define CONFIG_SYS_CBSIZE		1024
> diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
> index 609b4c2c3b..c490e2d98b 100644
> --- a/include/configs/stm32f429-evaluation.h
> +++ b/include/configs/stm32f429-evaluation.h
> @@ -23,8 +23,6 @@
>  #define CONFIG_SYS_MAX_FLASH_SECT	12
>  #define CONFIG_SYS_MAX_FLASH_BANKS	2
>  
> -#define CONFIG_STM32_FLASH
> -
>  #define CONFIG_SYS_HZ_CLOCK		1000000	/* Timer is clocked at 1MHz */
>  
>  #define CONFIG_SYS_CBSIZE		1024
> diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
> index a8f6fbf9cf..246dc1f9c6 100644
> --- a/include/configs/stm32f469-discovery.h
> +++ b/include/configs/stm32f469-discovery.h
> @@ -23,8 +23,6 @@
>  #define CONFIG_SYS_MAX_FLASH_SECT	12
>  #define CONFIG_SYS_MAX_FLASH_BANKS	2
>  
> -#define CONFIG_STM32_FLASH
> -
>  #define CONFIG_SYS_HZ_CLOCK		1000000	/* Timer is clocked at 1MHz */
>  
>  #define CONFIG_SYS_CBSIZE		1024
> diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
> index c76d290a57..493699e950 100644
> --- a/include/configs/stm32f746-disco.h
> +++ b/include/configs/stm32f746-disco.h
> @@ -22,8 +22,6 @@
>  #define CONFIG_SYS_MAX_FLASH_SECT	8
>  #define CONFIG_SYS_MAX_FLASH_BANKS	1
>  
> -#define CONFIG_STM32_FLASH
> -
>  #define CONFIG_DW_GMAC_DEFAULT_DMA_PBL	(8)
>  #define CONFIG_DW_ALTDESCRIPTOR
>  
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 61ae682dcd..e1e9d65e84 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1302,7 +1302,6 @@ CONFIG_STACKBASE
>  CONFIG_STANDALONE_LOAD_ADDR
>  CONFIG_STATIC_BOARD_REV
>  CONFIG_STD_DEVICES_SETTINGS
> -CONFIG_STM32_FLASH
>  CONFIG_STV0991
>  CONFIG_STV0991_HZ
>  CONFIG_STV0991_HZ_CLOCK
> 
Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>

Thanks
Patrice