On Fri, Sep 25, 2020 at 9:44 AM Simon Glass <s...@chromium.org> wrote: > > This should be squashed into the following patch: > > 4c87a12c16c x86: Use multiple images
Squashed this patch to 4c87a12c16c to u-boot-x86/next, thanks! > > Signed-off-by: Simon Glass <s...@chromium.org> > --- > > arch/x86/dts/emulation-u-boot.dtsi | 16 +++++++--------- > arch/x86/dts/quark-u-boot.dtsi | 8 +++----- > 2 files changed, 10 insertions(+), 14 deletions(-) > > diff --git a/arch/x86/dts/emulation-u-boot.dtsi > b/arch/x86/dts/emulation-u-boot.dtsi > index 6b651a394f3..7245fe51b3b 100644 > --- a/arch/x86/dts/emulation-u-boot.dtsi > +++ b/arch/x86/dts/emulation-u-boot.dtsi > @@ -7,17 +7,15 @@ > #include <u-boot.dtsi> > > #ifdef CONFIG_ROM_SIZE > -/ { > - binman { > +&rom { > #ifdef CONFIG_SPL > - u-boot-spl-with-ucode-ptr { > - optional-ucode; > - }; > + u-boot-spl-with-ucode-ptr { > + optional-ucode; > + }; > #else > - u-boot-with-ucode-ptr { > - optional-ucode; > - }; > -#endif > + u-boot-with-ucode-ptr { > + optional-ucode; > }; > +#endif > }; > #endif > diff --git a/arch/x86/dts/quark-u-boot.dtsi b/arch/x86/dts/quark-u-boot.dtsi > index 7ebc30166d2..60ffffcc0e7 100644 > --- a/arch/x86/dts/quark-u-boot.dtsi > +++ b/arch/x86/dts/quark-u-boot.dtsi > @@ -6,11 +6,9 @@ > #include <u-boot.dtsi> > > #ifdef CONFIG_ROM_SIZE > -/ { > - binman { > - u-boot-with-ucode-ptr { > - optional-ucode; > - }; > +&rom { > + u-boot-with-ucode-ptr { > + optional-ucode; > }; > }; > #endif > -- > 2.28.0.681.g6f77f65b4e-goog >