Commit 2431f22a authored by Masahiro Yamada's avatar Masahiro Yamada

kbuild: compute the dtbs_install destination more simply

The 'dtbinst_root' is used to remember the root of the in-kernel dts
directory (i.e. arch/*/boot/dts), but it looks clumsy.

I prefer using two variables 'obj' and 'dst' to track the in-kernel
directory and the install destination, respectively.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent b1112139
...@@ -1258,7 +1258,7 @@ endif ...@@ -1258,7 +1258,7 @@ endif
dtbs_check: dtbs dtbs_check: dtbs
dtbs_install: dtbs_install:
$(Q)$(MAKE) $(dtbinst)=$(dtstree) $(Q)$(MAKE) $(dtbinst)=$(dtstree) dst=$(INSTALL_DTBS_PATH)
ifdef CONFIG_OF_EARLY_FLATTREE ifdef CONFIG_OF_EARLY_FLATTREE
all: dtbs all: dtbs
......
...@@ -13,8 +13,6 @@ src := $(obj) ...@@ -13,8 +13,6 @@ src := $(obj)
PHONY := __dtbs_install PHONY := __dtbs_install
__dtbs_install: __dtbs_install:
export dtbinst_root ?= $(obj)
include include/config/auto.conf include include/config/auto.conf
include scripts/Kbuild.include include scripts/Kbuild.include
include $(src)/Makefile include $(src)/Makefile
...@@ -26,13 +24,11 @@ dtbinst-dirs := $(subdir-y) $(subdir-m) ...@@ -26,13 +24,11 @@ dtbinst-dirs := $(subdir-y) $(subdir-m)
quiet_cmd_dtb_install = INSTALL $< quiet_cmd_dtb_install = INSTALL $<
cmd_dtb_install = mkdir -p $(2); cp $< $(2) cmd_dtb_install = mkdir -p $(2); cp $< $(2)
install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj))
$(dtbinst-files): %.dtb: $(obj)/%.dtb $(dtbinst-files): %.dtb: $(obj)/%.dtb
$(call cmd,dtb_install,$(install-dir)) $(call cmd,dtb_install,$(dst))
$(dtbinst-dirs): $(dtbinst-dirs):
$(Q)$(MAKE) $(dtbinst)=$(obj)/$@ $(Q)$(MAKE) $(dtbinst)=$(obj)/$@ dst=$(dst)/$@
PHONY += $(dtbinst-files) $(dtbinst-dirs) PHONY += $(dtbinst-files) $(dtbinst-dirs)
__dtbs_install: $(dtbinst-files) $(dtbinst-dirs) __dtbs_install: $(dtbinst-files) $(dtbinst-dirs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment