mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-29 15:43:59 +08:00
Kbuild: Use dtc's -d (dependency) option
This hooks dtc into Kbuild's dependency system. Thus, for example, "make dtbs" will rebuild tegra-harmony.dtb if only tegra20.dtsi has changed yet tegra-harmony.dts has not. The previous lack of this feature recently caused me to have very confusing "git bisect" results. For ARM, it's obvious what to add to $(targets). I'm not familiar enough with other architectures to know what to add there. Powerpc appears to already add various .dtb files into $(targets), but the other archs may need something added to $(targets) to work. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Shawn Guo <shawn.guo@linaro.org> [mmarek: Dropped arch/c6x part to avoid merging commits from the middle of the merge window] Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
parent
136ec2049f
commit
7c43185138
arch
scripts
@ -59,9 +59,11 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
|
|||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
targets += $(dtb-y)
|
||||||
|
|
||||||
# Rule to build device tree blobs
|
# Rule to build device tree blobs
|
||||||
$(obj)/%.dtb: $(src)/dts/%.dts
|
$(obj)/%.dtb: $(src)/dts/%.dts FORCE
|
||||||
$(call cmd,dtc)
|
$(call if_changed_dep,dtc)
|
||||||
|
|
||||||
$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
|
$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
|
||||||
|
|
||||||
|
@ -53,6 +53,6 @@ $(obj)/simpleImage.%: vmlinux FORCE
|
|||||||
DTC_FLAGS := -p 1024
|
DTC_FLAGS := -p 1024
|
||||||
|
|
||||||
$(obj)/%.dtb: $(src)/dts/%.dts FORCE
|
$(obj)/%.dtb: $(src)/dts/%.dts FORCE
|
||||||
$(call cmd,dtc)
|
$(call if_changed_dep,dtc)
|
||||||
|
|
||||||
clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub
|
clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub
|
||||||
|
@ -11,5 +11,5 @@ clean-files := *.dtb.S
|
|||||||
|
|
||||||
#DTC_FLAGS ?= -p 1024
|
#DTC_FLAGS ?= -p 1024
|
||||||
|
|
||||||
$(obj)/%.dtb: $(src)/dts/%.dts
|
$(obj)/%.dtb: $(src)/dts/%.dts FORCE
|
||||||
$(call cmd,dtc)
|
$(call if_changed_dep,dtc)
|
||||||
|
@ -334,8 +334,8 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
|
|||||||
$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
|
$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
|
||||||
|
|
||||||
# Rule to build device tree blobs
|
# Rule to build device tree blobs
|
||||||
$(obj)/%.dtb: $(src)/dts/%.dts
|
$(obj)/%.dtb: $(src)/dts/%.dts FORCE
|
||||||
$(call cmd,dtc)
|
$(call if_changed_dep,dtc)
|
||||||
|
|
||||||
# If there isn't a platform selected then just strip the vmlinux.
|
# If there isn't a platform selected then just strip the vmlinux.
|
||||||
ifeq (,$(image-y))
|
ifeq (,$(image-y))
|
||||||
|
@ -264,7 +264,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb
|
|||||||
$(call cmd,dt_S_dtb)
|
$(call cmd,dt_S_dtb)
|
||||||
|
|
||||||
quiet_cmd_dtc = DTC $@
|
quiet_cmd_dtc = DTC $@
|
||||||
cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $<
|
cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $<
|
||||||
|
|
||||||
# Bzip2
|
# Bzip2
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user