From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 24 May 2017 21:17:15 +0300
Subject: [U-Boot] [PATCH] scripts/Makefile.lib: Only apply u-boot.dtsi
 files in the target directory
In-Reply-To: <1495638243-718-1-git-send-email-trini@konsulko.com>
References: <1495638243-718-1-git-send-email-trini@konsulko.com>
Message-ID: <1495649835.12947.4.camel@hp800z>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Tom,

On Wed, 2017-05-24 at 11:04 -0400, Tom Rini wrote:
> We only want to apply files such as 'omap5-u-boot.dtsi', which resides
> in arch/arm/dts/ to other files in arch/arm/dts/ and not say
> test/overlay/.  Rework the make logic to check for -u-boot.dtsi files in
> the same directory as their target dts.
> 

Verified that it fixes the build breakage.

Tested-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>

> Cc: Simon Glass <sjg@chromium.org>
> Reported-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  scripts/Makefile.lib | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 774aa89a3fe6..80ddb08474cd 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -164,14 +164,12 @@ cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE)     \
>  
>  ld_flags       = $(LDFLAGS) $(ldflags-y)
>  
> -dts_dir = $(srctree)/arch/$(ARCH)/dts
> -
>  # Try these files in order to find the U-Boot-specific .dtsi include file
> -u_boot_dtsi_options = $(wildcard $(dts_dir)/$(basename $(notdir $<))-u-boot.dtsi) \
> -	$(wildcard $(dts_dir)/$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \
> -	$(wildcard $(dts_dir)/$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \
> -	$(wildcard $(dts_dir)/$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \
> -	$(wildcard $(dts_dir)/u-boot.dtsi)
> +u_boot_dtsi_options = $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \
> +	$(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \
> +	$(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \
> +	$(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \
> +	$(wildcard $(dir $<)u-boot.dtsi)
>  
>  # Uncomment for debugging
>  # $(warning u_boot_dtsi_options: $(u_boot_dtsi_options))