diff options
| author | Tom Rini <trini@konsulko.com> | 2017-11-23 22:48:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-23 22:48:35 -0500 |
| commit | bb7ab1ccfec9aa4e2df3e8eb49ca85f6c0c65560 (patch) | |
| tree | 7cf3d11a538ce834689ed3749db66b2f99543443 /scripts | |
| parent | d9d76023ea0d567b0630e85d1bef67b5b1a788d3 (diff) | |
| parent | 9677faa34ee81c7abb4c08b0dc4ce4aace5473fc (diff) | |
| download | u-boot-bb7ab1ccfec9aa4e2df3e8eb49ca85f6c0c65560.tar.gz u-boot-bb7ab1ccfec9aa4e2df3e8eb49ca85f6c0c65560.tar.xz u-boot-bb7ab1ccfec9aa4e2df3e8eb49ca85f6c0c65560.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 0d5c5291a1..8f19b2db56 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -165,17 +165,27 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ ld_flags = $(LDFLAGS) $(ldflags-y) # Try these files in order to find the U-Boot-specific .dtsi include file -u_boot_dtsi_options = $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \ +u_boot_dtsi_options = $(strip $(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) + $(wildcard $(dir $<)u-boot.dtsi)) + +u_boot_dtsi_options_raw = $(warning Automatic .dtsi inclusion: options: \ + $(dir $<)$(basename $(notdir $<))-u-boot.dtsi \ + $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \ + $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \ + $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \ + $(dir $<)u-boot.dtsi ... \ + found: $(if $(u_boot_dtsi_options),"$(u_boot_dtsi_options)",nothing!)) # Uncomment for debugging -# $(warning u_boot_dtsi_options: $(u_boot_dtsi_options)) +# This shows all the files that were considered and the one that we chose. +# u_boot_dtsi_options_debug = $(u_boot_dtsi_options_raw) # We use the first match -u_boot_dtsi = $(notdir $(firstword $(u_boot_dtsi_options))) +u_boot_dtsi = $(strip $(u_boot_dtsi_options_debug) \ + $(notdir $(firstword $(u_boot_dtsi_options)))) # Modified for U-Boot dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ |