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

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

[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.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

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

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 734001c952a1..56e9d5424296 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -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
 
-- 
2.27.0

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

[Heinrich Schuchardt]

On 22.07.20 14:58, Michal Simek wrote:
> 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.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  scripts/Makefile.lib | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 734001c952a1..56e9d5424296 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -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.

Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>


>  DTC_FLAGS += -@
>  endif
>
>

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

[Simon Glass]

On Wed, 22 Jul 2020 at 06:58, Michal Simek <michal.simek@xilinx.com> wrote:
>
> 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.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  scripts/Makefile.lib | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

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

[Tom Rini]

On Wed, Jul 22, 2020 at 02:58:25PM +0200, Michal Simek wrote:

> 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.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
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>