| Message ID | 1495729438-5974-1-git-send-email-pantelis.antoniou@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 54cc4dcfdac1fdb0e7719556fd69980b4f80f47c |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, May 25, 2017 at 07:23:58PM +0300, Pantelis Antoniou wrote: > The dtb blob section must always be present in the resulting image. > Either if OF_EMBEDED is used or if unit tests include dtb blobs. > > Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com> Reviewed-by: Tom Rini <trini@konsulko.com>
Hi, On 25 May 2017 at 10:23, Pantelis Antoniou <pantelis.antoniou@konsulko.com> wrote: > The dtb blob section must always be present in the resulting image. > Either if OF_EMBEDED is used or if unit tests include dtb blobs. > OF_EMBED (and below) Reviewed-by: Simon Glass <sjg@chromium.org> > Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com> > --- > arch/arm/config.mk | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/config.mk b/arch/arm/config.mk > index a5eebb9..1a77779 100644 > --- a/arch/arm/config.mk > +++ b/arch/arm/config.mk > @@ -142,9 +142,11 @@ OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .hash \ > -j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn > endif > > -ifdef CONFIG_OF_EMBED > +# if a dtb section exists we always have to include it > +# there are only two cases where it is generated > +# 1) OF_EMBEDED is turned on > +# 2) unit tests include device tree blobs > OBJCOPYFLAGS += -j .dtb.init.rodata > -endif > > ifdef CONFIG_EFI_LOADER > OBJCOPYFLAGS += -j .efi_runtime -j .efi_runtime_rel > -- > 2.1.4 > Regards, Simon
On Thu, May 25, 2017 at 07:23:58PM +0300, Pantelis Antoniou wrote: > The dtb blob section must always be present in the resulting image. > Either if OF_EMBEDED is used or if unit tests include dtb blobs. > > Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com> > Reviewed-by: Tom Rini <trini@konsulko.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/arm/config.mk b/arch/arm/config.mk index a5eebb9..1a77779 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -142,9 +142,11 @@ OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .hash \ -j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn endif -ifdef CONFIG_OF_EMBED +# if a dtb section exists we always have to include it +# there are only two cases where it is generated +# 1) OF_EMBEDED is turned on +# 2) unit tests include device tree blobs OBJCOPYFLAGS += -j .dtb.init.rodata -endif ifdef CONFIG_EFI_LOADER OBJCOPYFLAGS += -j .efi_runtime -j .efi_runtime_rel
The dtb blob section must always be present in the resulting image. Either if OF_EMBEDED is used or if unit tests include dtb blobs. Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com> --- arch/arm/config.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)