On Mon, 22 Nov 2021 at 10:09, Patrice CHOTARD
<patrice.chot...@foss.st.com> wrote:
>
> Hi Patrick
>
> On 10/11/21 9:52 AM, Patrick Delaunay wrote:
> > Remove the dependency on CONFIG_TFABOOT in stm32mp Kconfig
> > - always activate the ARCH config: CONFIG_ARCH_SUPPORT_PSCI
> >   and CONFIG_CPU_V7_HAS_NONSEC
> > - CONFIG_ARMV7_NONSEC is deactivated in trusted defconfig
> > - the correct sysreset driver is activated in each defconfig:
> >   CONFIG_SYSRESET_PSCI or SYSRESET_SYSCON
> >
> > Reported-by: Alexandru Gagniuc <mr.nuke...@gmail.com>
> > Signed-off-by: Patrick Delaunay <patrick.delau...@foss.st.com>
> > ---
> >
> >  arch/arm/mach-stm32mp/Kconfig                             | 8 ++------
> >  configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig        | 1 +
> >  configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig       | 1 +
> >  .../stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig   | 1 +
> >  configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig   | 1 +
> >  configs/stm32mp15_basic_defconfig                         | 1 +
> >  configs/stm32mp15_defconfig                               | 3 +++
> >  configs/stm32mp15_dhcom_basic_defconfig                   | 1 +
> >  configs/stm32mp15_dhcor_basic_defconfig                   | 1 +
> >  configs/stm32mp15_trusted_defconfig                       | 3 +++
> >  10 files changed, 15 insertions(+), 6 deletions(-)
> >
> > diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
> > index 69d56c23e1..4ef0daeab2 100644
> > --- a/arch/arm/mach-stm32mp/Kconfig
> > +++ b/arch/arm/mach-stm32mp/Kconfig
> > @@ -35,10 +35,9 @@ config ENV_SIZE
> >
> >  config STM32MP15x
> >       bool "Support STMicroelectronics STM32MP15x Soc"
> > -     select ARCH_SUPPORT_PSCI if !TFABOOT
> > -     select ARM_SMCCC if TFABOOT
> > +     select ARCH_SUPPORT_PSCI
> >       select CPU_V7A
> > -     select CPU_V7_HAS_NONSEC if !TFABOOT
> > +     select CPU_V7_HAS_NONSEC
> >       select CPU_V7_HAS_VIRT
> >       select OF_BOARD_SETUP
> >       select PINCTRL_STM32
> > @@ -47,8 +46,6 @@ config STM32MP15x
> >       select STM32_SERIAL
> >       select SYS_ARCH_TIMER
> >       imply CMD_NVEDIT_INFO
> > -     imply SYSRESET_PSCI if TFABOOT
> > -     imply SYSRESET_SYSCON if !TFABOOT
> >       help
> >               support of STMicroelectronics SOC STM32MP15x family
> >               STM32MP157, STM32MP153 or STM32MP151
> > @@ -153,7 +150,6 @@ config NR_DRAM_BANKS
> >
> >  config DDR_CACHEABLE_SIZE
> >       hex "Size of the DDR marked cacheable in pre-reloc stage"
> > -     default 0x10000000 if TFABOOT
> >       default 0x40000000
> >       help
> >               Define the size of the DDR marked as cacheable in U-Boot
> > diff --git a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig 
> > b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
> > index 14bf6d1376..ecc5ec1ffe 100644
> > --- a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
> > +++ b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
> > @@ -73,6 +73,7 @@ CONFIG_REMOTEPROC_STM32_COPRO=y
> >  CONFIG_DM_RTC=y
> >  CONFIG_RTC_STM32=y
> >  CONFIG_SERIAL_RX_BUFFER=y
> > +CONFIG_SYSRESET_SYSCON=y
> >  CONFIG_WDT=y
> >  CONFIG_WDT_STM32MP=y
> >  CONFIG_LZO=y
> > diff --git a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig 
> > b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
> > index 648ecbfc67..fc5b5f370b 100644
> > --- a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
> > +++ b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
> > @@ -73,6 +73,7 @@ CONFIG_REMOTEPROC_STM32_COPRO=y
> >  CONFIG_DM_RTC=y
> >  CONFIG_RTC_STM32=y
> >  CONFIG_SERIAL_RX_BUFFER=y
> > +CONFIG_SYSRESET_SYSCON=y
> >  CONFIG_WDT=y
> >  CONFIG_WDT_STM32MP=y
> >  CONFIG_LZO=y
> > diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig 
> > b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
> > index f422ffbeda..4faa4e3ce4 100644
> > --- a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
> > +++ b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
> > @@ -73,6 +73,7 @@ CONFIG_REMOTEPROC_STM32_COPRO=y
> >  CONFIG_DM_RTC=y
> >  CONFIG_RTC_STM32=y
> >  CONFIG_SERIAL_RX_BUFFER=y
> > +CONFIG_SYSRESET_SYSCON=y
> >  CONFIG_WDT=y
> >  CONFIG_WDT_STM32MP=y
> >  CONFIG_LZO=y
> > diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig 
> > b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
> > index 244d9ccf4e..bab81bfa92 100644
> > --- a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
> > +++ b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
> > @@ -73,6 +73,7 @@ CONFIG_REMOTEPROC_STM32_COPRO=y
> >  CONFIG_DM_RTC=y
> >  CONFIG_RTC_STM32=y
> >  CONFIG_SERIAL_RX_BUFFER=y
> > +CONFIG_SYSRESET_SYSCON=y
> >  CONFIG_WDT=y
> >  CONFIG_WDT_STM32MP=y
> >  CONFIG_LZO=y
> > diff --git a/configs/stm32mp15_basic_defconfig 
> > b/configs/stm32mp15_basic_defconfig
> > index 77ed82c99f..6b3c2d6150 100644
> > --- a/configs/stm32mp15_basic_defconfig
> > +++ b/configs/stm32mp15_basic_defconfig
> > @@ -147,6 +147,7 @@ CONFIG_SPI=y
> >  CONFIG_DM_SPI=y
> >  CONFIG_STM32_QSPI=y
> >  CONFIG_STM32_SPI=y
> > +CONFIG_SYSRESET_SYSCON=y
> >  CONFIG_USB=y
> >  CONFIG_DM_USB_GADGET=y
> >  CONFIG_USB_EHCI_HCD=y
> > diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig
> > index 701b1510c5..9d97301075 100644
> > --- a/configs/stm32mp15_defconfig
> > +++ b/configs/stm32mp15_defconfig
> > @@ -8,10 +8,12 @@ CONFIG_ENV_OFFSET=0x480000
> >  CONFIG_ENV_SECT_SIZE=0x40000
> >  CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
> >  CONFIG_TARGET_ST_STM32MP15x=y
> > +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_DISTRO_DEFAULTS=y
> >  CONFIG_SYS_LOAD_ADDR=0xc2000000
> >  CONFIG_FIT=y
> > @@ -126,6 +128,7 @@ CONFIG_SPI=y
> >  CONFIG_DM_SPI=y
> >  CONFIG_STM32_QSPI=y
> >  CONFIG_STM32_SPI=y
> > +CONFIG_SYSRESET_PSCI=y
> >  CONFIG_TEE=y
> >  CONFIG_OPTEE=y
> >  # CONFIG_OPTEE_TA_AVB is not set
> > diff --git a/configs/stm32mp15_dhcom_basic_defconfig 
> > b/configs/stm32mp15_dhcom_basic_defconfig
> > index 5b85f6ad03..8da8f3fe2a 100644
> > --- a/configs/stm32mp15_dhcom_basic_defconfig
> > +++ b/configs/stm32mp15_dhcom_basic_defconfig
> > @@ -129,6 +129,7 @@ CONFIG_SPI=y
> >  CONFIG_DM_SPI=y
> >  CONFIG_STM32_QSPI=y
> >  CONFIG_STM32_SPI=y
> > +CONFIG_SYSRESET_SYSCON=y
> >  CONFIG_USB=y
> >  CONFIG_DM_USB_GADGET=y
> >  CONFIG_USB_EHCI_HCD=y
> > diff --git a/configs/stm32mp15_dhcor_basic_defconfig 
> > b/configs/stm32mp15_dhcor_basic_defconfig
> > index 37dd2754c0..4315c4be3c 100644
> > --- a/configs/stm32mp15_dhcor_basic_defconfig
> > +++ b/configs/stm32mp15_dhcor_basic_defconfig
> > @@ -123,6 +123,7 @@ CONFIG_SPI=y
> >  CONFIG_DM_SPI=y
> >  CONFIG_STM32_QSPI=y
> >  CONFIG_STM32_SPI=y
> > +CONFIG_SYSRESET_SYSCON=y
> >  CONFIG_USB=y
> >  CONFIG_DM_USB_GADGET=y
> >  CONFIG_USB_EHCI_HCD=y
> > diff --git a/configs/stm32mp15_trusted_defconfig 
> > b/configs/stm32mp15_trusted_defconfig
> > index b4ed090e3f..5e2ec49298 100644
> > --- a/configs/stm32mp15_trusted_defconfig
> > +++ b/configs/stm32mp15_trusted_defconfig
> > @@ -9,10 +9,12 @@ CONFIG_ENV_SECT_SIZE=0x40000
> >  CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
> >  CONFIG_STM32MP15x_STM32IMAGE=y
> >  CONFIG_TARGET_ST_STM32MP15x=y
> > +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_DISTRO_DEFAULTS=y
> >  CONFIG_SYS_LOAD_ADDR=0xc2000000
> >  CONFIG_FIT=y
> > @@ -127,6 +129,7 @@ CONFIG_SPI=y
> >  CONFIG_DM_SPI=y
> >  CONFIG_STM32_QSPI=y
> >  CONFIG_STM32_SPI=y
> > +CONFIG_SYSRESET_PSCI=y
> >  CONFIG_TEE=y
> >  CONFIG_OPTEE=y
> >  # CONFIG_OPTEE_TA_AVB is not set
> >
> Reviewed-by: Patrice Chotard <patrice.chot...@foss.st.com>
> Thanks
> Patrice

Acked-by: Ilias Apalodimas <ilias.apalodi...@linaro.org>

Reply via email to