[PATCH 05/16] arm: stm32mp: add choice for STM32MP SOC family

[Patrice CHOTARD]

HI Patrick

On 5/6/22 16:06, Patrick Delaunay wrote:
> Add mandatory choice for SOC support in ARCH_STM32MP.
> 
> This patch is a preliminary step for new SOC introduction
> in STM32MP family.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
>  arch/arm/mach-stm32mp/Kconfig       | 23 +++++++++++++----------
>  configs/stm32mp15_basic_defconfig   |  4 ++--
>  configs/stm32mp15_defconfig         |  4 ++--
>  configs/stm32mp15_trusted_defconfig |  4 ++--
>  4 files changed, 19 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
> index be0d74b4ac..446d3258c9 100644
> --- a/arch/arm/mach-stm32mp/Kconfig
> +++ b/arch/arm/mach-stm32mp/Kconfig
> @@ -33,6 +33,10 @@ config SYS_MALLOC_LEN
>  config ENV_SIZE
>  	default 0x2000
>  
> +choice
> +	prompt "Select STMicroelectronics STM32MPxxx Soc"
> +	default STM32MP15x
> +
>  config STM32MP15x
>  	bool "Support STMicroelectronics STM32MP15x Soc"
>  	select ARCH_SUPPORT_PSCI
> @@ -54,11 +58,13 @@ config STM32MP15x
>  		STM32MP157, STM32MP153 or STM32MP151
>  		STMicroelectronics MPU with core ARMv7
>  		dual core A7 for STM32MP157/3, monocore for STM32MP151
> -		target all the STMicroelectronics board with SOC STM32MP1 family
> +endchoice
> +
> +if STM32MP15x
>  
>  config STM32MP15x_STM32IMAGE
>  	bool "Support STM32 image for generated U-Boot image"
> -	depends on STM32MP15x && TFABOOT
> +	depends on TFABOOT
>  	help
>  		Support of STM32 image generation for SOC STM32MP15x
>  		for TF-A boot when FIP container is not used
> @@ -69,7 +75,6 @@ choice
>  
>  config TARGET_ST_STM32MP15x
>  	bool "STMicroelectronics STM32MP15x boards"
> -	select STM32MP15x
>  	imply BOOTSTAGE
>  	imply CMD_BOOTSTAGE
>  	imply CMD_CLS if CMD_BMP
> @@ -84,7 +89,6 @@ config TARGET_ST_STM32MP15x
>  
>  config TARGET_MICROGEA_STM32MP1
>  	bool "Engicam MicroGEA STM32MP1 SOM"
> -	select STM32MP15x
>  	imply BOOTSTAGE
>  	imply CMD_BOOTSTAGE
>  	imply CMD_CLS if CMD_BMP
> @@ -109,7 +113,6 @@ config TARGET_MICROGEA_STM32MP1
>  
>  config TARGET_ICORE_STM32MP1
>  	bool "Engicam i.Core STM32MP1 SOM"
> -	select STM32MP15x
>  	imply BOOTSTAGE
>  	imply CMD_BOOTSTAGE
>  	imply CMD_CLS if CMD_BMP
> @@ -131,12 +134,16 @@ config TARGET_ICORE_STM32MP1
>  
>  config TARGET_DH_STM32MP1_PDK2
>  	bool "DH STM32MP1 PDK2"
> -	select STM32MP15x
>  	help
>  		Target the DH PDK2 development kit with STM32MP15x SoM.
>  
>  endchoice
>  
> +source "board/st/stm32mp1/Kconfig"
> +source "board/dhelectronics/dh_stm32mp1/Kconfig"
> +source "board/engicam/stm32mp1/Kconfig"
> +endif
> +
>  config SYS_TEXT_BASE
>  	default 0xC0100000
>  
> @@ -221,8 +228,4 @@ config DEBUG_UART_CLOCK
>  endif
>  
>  source "arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig"
> -source "board/dhelectronics/dh_stm32mp1/Kconfig"
> -source "board/engicam/stm32mp1/Kconfig"
> -source "board/st/stm32mp1/Kconfig"
> -
>  endif
> diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
> index 5d1b2e0fd7..46b1cee5e7 100644
> --- a/configs/stm32mp15_basic_defconfig
> +++ b/configs/stm32mp15_basic_defconfig
> @@ -9,10 +9,10 @@ CONFIG_SPL_TEXT_BASE=0x2FFC2500
>  CONFIG_SPL_MMC=y
>  CONFIG_SPL=y
>  CONFIG_TARGET_ST_STM32MP15x=y
> +CONFIG_TYPEC_STUSB160X=y
> +CONFIG_ENV_OFFSET_REDUND=0x2C0000
>  CONFIG_CMD_STM32KEY=y
>  CONFIG_CMD_STM32PROG=y
> -CONFIG_ENV_OFFSET_REDUND=0x2C0000
> -CONFIG_TYPEC_STUSB160X=y
>  CONFIG_SPL_SPI_FLASH_SUPPORT=y
>  CONFIG_SPL_SPI=y
>  # CONFIG_ARMV7_VIRT is not set
> diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig
> index f6e7fc81b0..8bb8e4624d 100644
> --- a/configs/stm32mp15_defconfig
> +++ b/configs/stm32mp15_defconfig
> @@ -6,11 +6,11 @@ CONFIG_ENV_OFFSET=0x480000
>  CONFIG_ENV_SECT_SIZE=0x40000
>  CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
>  CONFIG_TARGET_ST_STM32MP15x=y
> +CONFIG_TYPEC_STUSB160X=y
> +CONFIG_ENV_OFFSET_REDUND=0x4C0000
>  CONFIG_DDR_CACHEABLE_SIZE=0x10000000
>  CONFIG_CMD_STM32KEY=y
>  CONFIG_CMD_STM32PROG=y
> -CONFIG_ENV_OFFSET_REDUND=0x4C0000
> -CONFIG_TYPEC_STUSB160X=y
>  # CONFIG_ARMV7_NONSEC is not set
>  CONFIG_SYS_LOAD_ADDR=0xc2000000
>  CONFIG_SYS_MEMTEST_START=0xc0000000
> diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
> index 855a394893..4f73930924 100644
> --- a/configs/stm32mp15_trusted_defconfig
> +++ b/configs/stm32mp15_trusted_defconfig
> @@ -7,11 +7,11 @@ CONFIG_ENV_SECT_SIZE=0x40000
>  CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
>  CONFIG_STM32MP15x_STM32IMAGE=y
>  CONFIG_TARGET_ST_STM32MP15x=y
> +CONFIG_TYPEC_STUSB160X=y
> +CONFIG_ENV_OFFSET_REDUND=0x2C0000
>  CONFIG_DDR_CACHEABLE_SIZE=0x10000000
>  CONFIG_CMD_STM32KEY=y
>  CONFIG_CMD_STM32PROG=y
> -CONFIG_ENV_OFFSET_REDUND=0x2C0000
> -CONFIG_TYPEC_STUSB160X=y
>  # CONFIG_ARMV7_NONSEC is not set
>  CONFIG_SYS_LOAD_ADDR=0xc2000000
>  CONFIG_SYS_MEMTEST_START=0xc0000000
Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>

Thanks
Patrice