Hi Simon, On Fri, Apr 26, 2019 at 12:00 PM Simon Glass <s...@chromium.org> wrote: > > Add TPL binaries to the device x86 binman desciption. When enabled, TPL > will start first, doing the 16-bit init, then jump to SPL and finally > U-Boot proper. > > Signed-off-by: Simon Glass <s...@chromium.org> > --- > > Changes in v2: None > > arch/x86/dts/u-boot.dtsi | 26 ++++++++++++++++++++++++-- > 1 file changed, 24 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi > index 1050236330a..70e9c8f7acd 100644 > --- a/arch/x86/dts/u-boot.dtsi > +++ b/arch/x86/dts/u-boot.dtsi > @@ -22,7 +22,21 @@ > filename = CONFIG_INTEL_ME_FILE; > }; > #endif > -#ifdef CONFIG_SPL > +#ifdef CONFIG_TPL > + u-boot-spl { > + offset = <CONFIG_SPL_TEXT_BASE>; > + }; > + u-boot-spl-dtb { > + }; > + u-boot-tpl-with-ucode-ptr { > + offset = <CONFIG_TPL_TEXT_BASE>; > + }; > + u-boot-tpl-dtb { > + };
nits: since TPL starts before SPL, can we put the TPL* nodes before SPL* nodes? > + u-boot { > + offset = <CONFIG_SYS_TEXT_BASE>; > + }; > +#elif defined(CONFIG_SPL) > u-boot-spl-with-ucode-ptr { > offset = <CONFIG_SPL_TEXT_BASE>; > }; > @@ -31,7 +45,11 @@ > type = "u-boot-dtb-with-ucode"; > }; > u-boot { > +#if CONFIG_SYS_TEXT_BASE == 0x1110000 The magic number comparison does not look good. > offset = <0xfff00000>; > +#else > + offset = <CONFIG_SYS_TEXT_BASE>; > +#endif > }; > #else > u-boot-with-ucode-ptr { > @@ -77,7 +95,11 @@ > offset = <CONFIG_X86_REFCODE_ADDR>; > }; > #endif > -#ifdef CONFIG_SPL > +#ifdef CONFIG_TPL > + x86-start16-tpl { > + offset = <CONFIG_SYS_X86_START16>; > + }; > +#elif defined(CONFIG_SPL) > x86-start16-spl { > offset = <CONFIG_SYS_X86_START16>; > }; > -- Regards, Bin _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot