HI Patrick
On 9/14/21 2:14 PM, Patrick Delaunay wrote:
> Continue to use the "ssbl" name for GPT partition of secondary boot
> stage = U-Boot for basic boot with SPL to avoid to disturb existing user.
>
> The "fip" partition name is only used for TFA_BOOT with FIP, it is a TF-A
> BL2 requirement; it the default configuration for STMicroelectronics
> boards.
>
> Fixes: b73e8bf453f8 ("arm: stm32mp: add defconfig for trusted boot with FIP")
> Signed-off-by: Patrick Delaunay <patrick.delau...@foss.st.com>
> ---
>
> arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 4 +++-
> arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 4 +++-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
> b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
> index 0101962ea5..15a04ae927 100644
> --- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
> @@ -21,11 +21,13 @@
> st,stm32prog-gpios = <&gpioa 14 (GPIO_ACTIVE_LOW |
> GPIO_PULL_UP)>;
> };
>
> -#ifdef CONFIG_STM32MP15x_STM32IMAGE
> +#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
> config {
> u-boot,mmc-env-partition = "ssbl";
> };
> +#endif
>
> +#ifdef CONFIG_STM32MP15x_STM32IMAGE
> /* only needed for boot with TF-A, witout FIP support */
> firmware {
> optee {
> diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
> b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
> index 32777384c6..408abaf52f 100644
> --- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
> @@ -20,11 +20,13 @@
> st,stm32prog-gpios = <&gpioa 14 (GPIO_ACTIVE_LOW |
> GPIO_PULL_UP)>;
> };
>
> -#ifdef CONFIG_STM32MP15x_STM32IMAGE
> +#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
> config {
> u-boot,mmc-env-partition = "ssbl";
> };
> +#endif
>
> +#ifdef CONFIG_STM32MP15x_STM32IMAGE
> /* only needed for boot with TF-A, witout FIP support */
> firmware {
> optee {
>
Reviewed-by: Patrice Chotard <patrice.chot...@foss.st.com>
Thanks
Patrice
