ARM: stm32: Add STM32MP13xx SPL Kconfig options

Introduce Kconfig options used by SPL on STM32MP13xx and isolate
the Kconfig options only used in case TFA BL2 is used as a SPL
behind CONFIG_TFABOOT dependency.

Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Signed-off-by: Marek Vasut <marek.vasut@mailbox.org>

diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
index 09b7d5123ae0a524c5a9a8ab5943d16ee00eb0a8..c658ac19b4151885198343df3754eb56c0543de8 100644 (file)
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -40,16 +40,19 @@ choice
 config STM32MP13X
        bool "Support STMicroelectronics STM32MP13x Soc"
        select ARCH_EARLY_INIT_R
-       select ARM_SMCCC
+       select ARM_SMCCC if TFABOOT
+       select ARCH_SUPPORT_PSCI if !TFABOOT
+       select BINMAN if !TFABOOT
        select CPU_V7A
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
-       select OF_BOARD
+       select OF_BOARD if TFABOOT
        select OF_BOARD_SETUP
        select PINCTRL_STM32
        select STM32_RCC
        select STM32_RESET
        select STM32_SERIAL
+       select SUPPORT_SPL if !TFABOOT
        select SYS_ARCH_TIMER
        imply CMD_NVEDIT_INFO
        imply OF_UPSTREAM

diff --git a/arch/arm/mach-stm32mp/Kconfig.13x b/arch/arm/mach-stm32mp/Kconfig.13x
index bc8b3f8cf77f9042e2bc4ce0df19674fd2579773..cecf9e3b8c7e2cb9bfa551c5b946259c7c59bb61 100644 (file)
--- a/arch/arm/mach-stm32mp/Kconfig.13x
+++ b/arch/arm/mach-stm32mp/Kconfig.13x
@@ -20,7 +20,8 @@ config TARGET_ST_STM32MP13X
 endchoice
 
 config TEXT_BASE
-       default 0xC0000000
+       default 0xC0000000 if TFABOOT
+       default 0xC0100000 if !TFABOOT
 
 config PRE_CON_BUF_ADDR
        default 0xC0800000