[PATCH 14/29] rockchip: Add SPL into the main FIT

[Simon Glass]

Hi Jonas,

On Sat, 8 Feb 2025 at 18:36, Jonas Karlman <jonas at kwiboo.se> wrote:
>
> Hi Simon,
>
> On 2025-02-05 02:55, Simon Glass wrote:
> > VBE may want to load the SPL image from the same FIT as contains U-Boot,
> > if there is enough memory, so add it.
> >
> > Signed-off-by: Simon Glass <sjg at chromium.org>
> > ---
> >
> >  arch/arm/dts/rockchip-u-boot.dtsi | 23 +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> >
> > diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
> > index 7cce213c32e..39908495894 100644
> > --- a/arch/arm/dts/rockchip-u-boot.dtsi
> > +++ b/arch/arm/dts/rockchip-u-boot.dtsi
> > @@ -72,6 +72,25 @@
> >               fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
> >               fit,align = <512>;
> >               images {
> > +#ifdef CONFIG_VPL
>
> Is VPL intended to be exclusive to VBE? This (and others) should
> possible test for another Kconfig symbol?

For now, yes. In the unlikely event that EFI adopts earlier update, we
could look at what else to do.

>
> > +                     spl {
> > +                             description = "U-Boot SPL";
> > +                             type = "firmware";
> > +                             os = "u-boot";
> > +                             arch = ARCH;
> > +                             compression = "lz4";
> > +                             load = <CONFIG_SPL_TEXT_BASE>;
> > +                             entry = <CONFIG_SPL_TEXT_BASE>;
> > +                             phase = "spl";
> > +                             section {
> > +                                     compress = "lz4";
> > +                                     u-boot-spl-nodtb {
> > +                                     };
> > +                                     u-boot-spl-bss-pad {
> > +                                     };
> > +                             };
> > +                     };
>
> Is this spl part really used for anything? Later you are adding a spl
> template and using that for other vbe parts, it is not clear for what or
> when this is intended to be used.

No, it isn't used, but only due to SRAM-size limitations. I suspect
with the RK3288 we can use it. I left it in so that it is clear that
the phase selected by the code, not which FIT is loaded.

>
> Regards,
> Jonas
>
> > +#endif /* VPL */
> >                       u-boot {
> >                               description = "U-Boot";
> >                               type = "standalone";
> > @@ -172,7 +191,11 @@
> >                               description = "NAME.dtb";
> >                               fdt = "fdt-SEQ";
> >  #ifdef CONFIG_ARM64
> > +# ifdef CONFIG_VPL
> > +                             fit,firmware = "atf-1", "u-boot", "spl";
> > +# else
> >                               fit,firmware = "atf-1", "u-boot";
> > +# endif
> >  #else
> >                               fit,firmware = "op-tee", "u-boot";
> >  #endif
>

Regards,
Simon