Commit a7f92419 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: add %.dtb.S and %.dtb to 'targets' automatically 



Another common pattern that consists of chained commands is to compile
a DTB as binary data into the kernel image or a module.  It is used in
several places in the source tree.  Support it in the core Makefile.

$(call if_changed,dt_S_dtb) is more suitable than $(call cmd,dt_S_dtb)
in case cmd_dt_S_dtb is changed in the future.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarFrank Rowand <frowand.list@gmail.com>
parent b23d1a24

drivers/of/unittest-data/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ obj-$(CONFIG_OF_OVERLAY) += overlay.dtb.o \ 
			    overlay_bad_symbol.dtb.o \

			    overlay_base.dtb.o



targets += $(foreach suffix, dtb dtb.S, $(patsubst %.dtb.o,%.$(suffix),$(obj-y)))



# enable creation of __symbols__ node

DTC_FLAGS_overlay += -@

DTC_FLAGS_overlay_bad_phandle += -@

scripts/Makefile.build

+3 −1
Original line number Diff line number Diff line
@@ -544,9 +544,11 @@ targets := $(filter-out $(PHONY), $(targets)) 
intermediate_targets = $(foreach sfx, $(2), \

				$(patsubst %$(strip $(1)),%$(sfx), \

					$(filter %$(strip $(1)), $(targets))))

# %.dtb.o <- %.dtb.S <- %.dtb <- %.dts

# %.lex.o <- %.lex.c <- %.l

# %.tab.o <- %.tab.[ch] <- %.y

targets += $(call intermediate_targets, .lex.o, .lex.c) \

targets += $(call intermediate_targets, .dtb.o, .dtb.S .dtb) \

	   $(call intermediate_targets, .lex.o, .lex.c) \

	   $(call intermediate_targets, .tab.o, .tab.c .tab.h)



# Descending

scripts/Makefile.lib

+2 −2
Original line number Diff line number Diff line
@@ -279,8 +279,8 @@ cmd_dt_S_dtb= \ 
	echo '.balign STRUCT_ALIGNMENT'; 		\

) > $@



$(obj)/%.dtb.S: $(obj)/%.dtb

	$(call cmd,dt_S_dtb)

$(obj)/%.dtb.S: $(obj)/%.dtb FORCE

	$(call if_changed,dt_S_dtb)



quiet_cmd_dtc = DTC     $@

cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \

CRA Git | Maintained and supported by SUSTech CRA and CCSE