Hi Patrick
On 3/31/20 6:04 PM, Patrick Delaunay wrote:
> Add the bsec driver in SPL, as it is needed by SOC part number detection.
>
> Signed-off-by: Patrick Delaunay <patrick.delau...@st.com>
> ---
>
> arch/arm/dts/stm32mp15-u-boot.dtsi | 2 +-
> arch/arm/mach-stm32mp/Makefile | 2 +-
> arch/arm/mach-stm32mp/bsec.c | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi
> b/arch/arm/dts/stm32mp15-u-boot.dtsi
> index 8f9535a4db..e0b1223de8 100644
> --- a/arch/arm/dts/stm32mp15-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp15-u-boot.dtsi
> @@ -40,7 +40,7 @@
> };
>
> &bsec {
> - u-boot,dm-pre-proper;
> + u-boot,dm-pre-reloc;
> };
>
> &clk_csi {
> diff --git a/arch/arm/mach-stm32mp/Makefile b/arch/arm/mach-stm32mp/Makefile
> index eee39c27c3..f29d6f795f 100644
> --- a/arch/arm/mach-stm32mp/Makefile
> +++ b/arch/arm/mach-stm32mp/Makefile
> @@ -6,11 +6,11 @@
> obj-y += cpu.o
> obj-y += dram_init.o
> obj-y += syscon.o
> +obj-y += bsec.o
>
> ifdef CONFIG_SPL_BUILD
> obj-y += spl.o
> else
> -obj-y += bsec.o
> obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o
> obj-$(CONFIG_ARMV7_PSCI) += psci.o
> endif
> diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
> index 3b923f088e..1bd287e8bf 100644
> --- a/arch/arm/mach-stm32mp/bsec.c
> +++ b/arch/arm/mach-stm32mp/bsec.c
> @@ -473,7 +473,7 @@ static int stm32mp_bsec_ofdata_to_platdata(struct udevice
> *dev)
> return 0;
> }
>
> -#ifndef CONFIG_STM32MP1_TRUSTED
> +#if !defined(CONFIG_STM32MP1_TRUSTED) && !defined(CONFIG_SPL_BUILD)
> static int stm32mp_bsec_probe(struct udevice *dev)
> {
> int otp;
> @@ -500,7 +500,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = {
> .ofdata_to_platdata = stm32mp_bsec_ofdata_to_platdata,
> .platdata_auto_alloc_size = sizeof(struct stm32mp_bsec_platdata),
> .ops = &stm32mp_bsec_ops,
> -#ifndef CONFIG_STM32MP1_TRUSTED
> +#if !defined(CONFIG_STM32MP1_TRUSTED) && !defined(CONFIG_SPL_BUILD)
> .probe = stm32mp_bsec_probe,
> #endif
> };
Reviewed-by: Patrice Chotard <patrice.chot...@st.com>
Thanks
