Skip to contentSkip to conversation

Makefile.lib: Build all DTS with -@ if OF_LIBFDT_OVERLAY is enabled

PATCH New Michal Simek 4 participants 4 messages Jul 22, 2020 – Aug 5, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile.lib: Build all DTS with -@ if OF_LIBFDT_OVERLAY is enabled

The commit 47818e23a228 ("Makefile.lib: include /__symbols__ in dtb if SPL_LOAD_FIT_APPLY_OVERLAY is enabled") enables DT building as overlays based on symbols which depends on SPL. But there is already an option to apply overlays in full U-Boot too.
And there are platforms which are not using SPL and there is no option to build DTs with -@ parameter.
That's why change dependency on OF_LIBFDT_OVERLAY which is already symbol which is selected when SPL_LOAD_FIT_APPLY_OVERLAY is enabled but also adding support for platforms which don't enable SPL and want to work with overlays on U-Boot prompt.

---

 scripts/Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.lib +1 -1
index 734001c952a1..56e9d5424296 100644
@@ -311,7 +311,7 @@ cmd_dt_S_dtb=						\
 $(obj)/%.dtb.S: $(obj)/%.dtb
 	$(call cmd,dt_S_dtb)
 
-ifeq ($(CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY),y)
+ifeq ($(CONFIG_OF_LIBFDT_OVERLAY),y)
 DTC_FLAGS += -@
 endif
 
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 Makefile.lib: Build all DTS with -@ if OF_LIBFDT_OVERLAY is enabled

Quoted 22 lines · Michal Simek

The commit 47818e23a228 ("Makefile.lib: include /__symbols__ in dtb if SPL_LOAD_FIT_APPLY_OVERLAY is enabled") enables DT building as overlays based on symbols which depends on SPL. But there is already an option to apply overlays in full U-Boot too.
And there are platforms which are not using SPL and there is no option to build DTs with -@ parameter.
That's why change dependency on OF_LIBFDT_OVERLAY which is already symbol which is selected when SPL_LOAD_FIT_APPLY_OVERLAY is enabled but also adding support for platforms which don't enable SPL and want to work with overlays on U-Boot prompt.

---

 scripts/Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.lib +0 -0
index 734001c952a1..56e9d5424296 100644

scripts/Makefile.lib cmd_dt_S_dtb= \ · line 314

Quoted 5 lines
scripts/Makefile.lib +1 -1
@@ -311,7 +311,7 @@ cmd_dt_S_dtb=						\
 $(obj)/%.dtb.S: $(obj)/%.dtb
 	$(call cmd,dt_S_dtb)
 
-ifeq ($(CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY),y)
+ifeq ($(CONFIG_OF_LIBFDT_OVERLAY),y)

This matches the requirement in cmd/fdt.c for applying overlays using the fdt command.

Quoted 4 lines
scripts/Makefile.lib +0 -0
 DTC_FLAGS += -@
 endif
 
#2 lore raw

PATCH 1/1 Makefile.lib: Build all DTS with -@ if OF_LIBFDT_OVERLAY is enabled

In reply to Michal Simek
Quoted 12 lines · Michal Simek

The commit 47818e23a228 ("Makefile.lib: include /__symbols__ in dtb if SPL_LOAD_FIT_APPLY_OVERLAY is enabled") enables DT building as overlays based on symbols which depends on SPL. But there is already an option to apply overlays in full U-Boot too.
And there are platforms which are not using SPL and there is no option to build DTs with -@ parameter.
That's why change dependency on OF_LIBFDT_OVERLAY which is already symbol which is selected when SPL_LOAD_FIT_APPLY_OVERLAY is enabled but also adding support for platforms which don't enable SPL and want to work with overlays on U-Boot prompt.

Quoted 5 lines

---

 scripts/Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
#3 lore raw

PATCH 1/1 Makefile.lib: Build all DTS with -@ if OF_LIBFDT_OVERLAY is enabled

In reply to Michal Simek
Quoted 11 lines · Michal Simek

The commit 47818e23a228 ("Makefile.lib: include /__symbols__ in dtb if SPL_LOAD_FIT_APPLY_OVERLAY is enabled") enables DT building as overlays based on symbols which depends on SPL. But there is already an option to apply overlays in full U-Boot too.
And there are platforms which are not using SPL and there is no option to build DTs with -@ parameter.
That's why change dependency on OF_LIBFDT_OVERLAY which is already symbol which is selected when SPL_LOAD_FIT_APPLY_OVERLAY is enabled but also adding support for platforms which don't enable SPL and want to work with overlays on U-Boot prompt.

Quoted 3 lines

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200805/6383de34/attachment.sig>