Merge "scripts: Makefile: Add multi overlay dtbo-base apply verify" (341f70c7) · Commits · e / devices / android_kernel_fairphone_FP5

scripts/Makefile.build

+5 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,11 @@ ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(h
		include scripts/Makefile.host
		endif

		# Do not include host rules unless needed
		ifneq ($(dtbo-y),)
		include scripts/Makefile.dtbo
		endif

		ifndef obj
		$(warning kbuild: Makefile.build is included improperly)
		endif

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		__dtbo := $(sort $(dtbo-y))

		dtbo-base := $(sort $(foreach m,$(__dtbo),$($(m)-base)))
		dtbo := $(foreach m,$(__dtbo),$(if $($(m)-base),$(m)))

		__dtbo := $(addprefix $(obj)/,$(__dtbo))
		dtbo-base := $(addprefix $(obj)/,$(dtbo-base))
		dtbo := $(addprefix $(obj)/,$(dtbo))

		ifneq ($(DTC_OVERLAY_TEST_EXT),)
		DTC_OVERLAY_TEST = $(DTC_OVERLAY_TEST_EXT)
		quiet_cmd_dtbo_verify = VERIFY $@
		cmd_dtbo_verify = $(foreach m,\
		$(addprefix $(obj)/,$($(@F)-base)),\
		$(if $(m),\
		$(DTC_OVERLAY_TEST) $(m) $@ \
		$(dot-target).$(patsubst $(obj)/%.dtb,%,$(m)).tmp;))\
		true
		else
		cmd_dtbo_verify = true
		endif

		$(obj)/%.dtbo: $(src)/%.dts FORCE
		$(call if_changed_dep,dtc,dtb,-@)
		$(call if_changed,dtbo_verify)

		$(call multi_depend, $(dtbo), , -base)

		always += $(dtbo)

+2 −2

Original line number	Diff line number	Diff line
		@@ -291,12 +291,12 @@ quiet_cmd_dtc = DTC $@
		cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
		$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
		$(DTC) -O $(2) -o $@ -b 0 \
		$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
		$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(3) $(DTC_FLAGS) \
		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
		cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)

		$(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE
		$(call if_changed_dep,dtc,dtb)
		$(call if_changed_dep,dtc,dtb,-@)

		DT_CHECKER ?= dt-validate
		DT_BINDING_DIR := Documentation/devicetree/bindings