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

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

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ endif 
dtbs_check: dtbs



dtbs_install:

	$(Q)$(MAKE) $(dtbinst)=$(dtstree)

	$(Q)$(MAKE) $(dtbinst)=$(dtstree) dst=$(INSTALL_DTBS_PATH)



ifdef CONFIG_OF_EARLY_FLATTREE

all: dtbs

scripts/Makefile.dtbinst

+2 −6
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ src := $(obj) 
PHONY := __dtbs_install

__dtbs_install:



export dtbinst_root ?= $(obj)



include include/config/auto.conf

include scripts/Kbuild.include

include $(src)/Makefile
@@ -26,13 +24,11 @@ dtbinst-dirs := $(subdir-y) $(subdir-m) 
quiet_cmd_dtb_install =	INSTALL $<

      cmd_dtb_install =	mkdir -p $(2); cp $< $(2)



install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj))



$(dtbinst-files): %.dtb: $(obj)/%.dtb

	$(call cmd,dtb_install,$(install-dir))

	$(call cmd,dtb_install,$(dst))



$(dtbinst-dirs):

	$(Q)$(MAKE) $(dtbinst)=$(obj)/$@

	$(Q)$(MAKE) $(dtbinst)=$(obj)/$@ dst=$(dst)/$@



PHONY += $(dtbinst-files) $(dtbinst-dirs)

__dtbs_install: $(dtbinst-files) $(dtbinst-dirs)

CRA Git | Maintained and supported by SUSTech CRA and CCSE