summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPantelis Antoniou <pantelis.antoniou@konsulko.com>2017-05-25 19:23:58 +0300
committerTom Rini <trini@konsulko.com>2017-06-05 14:13:11 -0400
commit54cc4dcfdac1fdb0e7719556fd69980b4f80f47c (patch)
tree8f34559c85131f4070f7a371317137ba019f1e14 /arch
parentb12550eb9c0b3d76a8a990be5076ada0cc553680 (diff)
arm: Always keep the dtb section on objcopy
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/config.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index a5eebb95e5..1a77779db4 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