summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2021-03-10 11:05:29 +0530
committerRob Herring <robh@kernel.org>2021-03-23 15:27:51 -0600
commit9ca29e41508e97bec2f45c7f9b79108107d6b3d5 (patch)
tree6bfc854794a484e60317ef7c5e8ec66e331d00ab /scripts
parent3b2e006220dfe5c59ff2fe243aaf01d038c12ccf (diff)
downloadlinux-stable-9ca29e41508e97bec2f45c7f9b79108107d6b3d5.tar.gz
linux-stable-9ca29e41508e97bec2f45c7f9b79108107d6b3d5.tar.bz2
linux-stable-9ca29e41508e97bec2f45c7f9b79108107d6b3d5.zip
kbuild: Simplify builds with CONFIG_OF_ALL_DTBS
We update 'always-y' based on CONFIG_OF_ALL_DTBS three times. It would be far more straight forward if we rather update dtb-y to include all .dtb files if CONFIG_OF_ALL_DTBS is enabled. Acked-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Frank Rowand <frank.rowand@sony.com> Tested-by: Frank Rowand <frank.rowand@sony.com> Signed-off-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/7fe7e5ef6ed75450ddf6c224b8adb53059e504e2.1615354376.git.viresh.kumar@linaro.org
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 34e5fefa8d92..441a224689f9 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -73,14 +73,13 @@ always-y += $(userprogs-always-y) $(userprogs-always-m)
# DTB
# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
+dtb-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
+
always-y += $(dtb-y)
-always-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
ifneq ($(CHECK_DTBS),)
always-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
always-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y))
-always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
-always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-))
endif
# Add subdir path