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

kbuild: split device tree build rules into scripts/Makefile.dtbs 



scripts/Makefile.lib is included not only from scripts/Makefile.build
but also from scripts/Makefile.{modfinal,package,vmlinux,vmlinux_o},
where DT build rules are not required.

Split the DT build rules out to scripts/Makefile.dtbs, and include it
only when necessary.

While I was here, I added $(DT_TMP_SCHEMA) as a prerequisite of
$(multi-dtb-y).

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarRob Herring (Arm) <robh@kernel.org>
parent fc41a0a7

drivers/of/fdt.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


/*

 * __dtb_empty_root_begin[] and __dtb_empty_root_end[] magically created by

 * cmd_dt_S_dtb in scripts/Makefile.lib

 * cmd_wrap_S_dtb in scripts/Makefile.dtbs

 */

extern uint8_t __dtb_empty_root_begin[];

extern uint8_t __dtb_empty_root_end[];

drivers/of/unittest.c

+2 −2
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ static int __init unittest_data_add(void) 
	struct device_node *unittest_data_node = NULL, *np;

	/*

	 * __dtbo_testcases_begin[] and __dtbo_testcases_end[] are magically

	 * created by cmd_dt_S_dtbo in scripts/Makefile.lib

	 * created by cmd_wrap_S_dtbo in scripts/Makefile.dtbs

	 */

	extern uint8_t __dtbo_testcases_begin[];

	extern uint8_t __dtbo_testcases_end[];
@@ -3525,7 +3525,7 @@ static void __init of_unittest_lifecycle(void) 


/*

 * __dtbo_##overlay_name##_begin[] and __dtbo_##overlay_name##_end[] are

 * created by cmd_dt_S_dtbo in scripts/Makefile.lib

 * created by cmd_wrap_S_dtbo in scripts/Makefile.dtbs

 */



#define OVERLAY_INFO_EXTERN(overlay_name) \

scripts/Makefile.build

+8 −17
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ endif 
# subdir-builtin and subdir-modorder may contain duplications. Use $(sort ...)

subdir-builtin := $(sort $(filter %/built-in.a, $(real-obj-y)))

subdir-modorder := $(sort $(filter %/modules.order, $(obj-m)))

subdir-dtbslist := $(sort $(filter %/dtbs-list, $(dtb-y)))



targets-for-builtin := $(extra-y)
@@ -349,7 +348,7 @@ $(obj)/%.o: $(obj)/%.S FORCE 


targets += $(filter-out $(subdir-builtin), $(real-obj-y))

targets += $(filter-out $(subdir-modorder), $(real-obj-m))

targets += $(real-dtb-y) $(lib-y) $(always-y)

targets += $(lib-y) $(always-y)



# Linker scripts preprocessor (.lds.S -> .lds)

# ---------------------------------------------------------------------------
@@ -375,7 +374,6 @@ $(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler 
# To build objects in subdirs, we need to descend into the directories

$(subdir-builtin): $(obj)/%/built-in.a: $(obj)/% ;

$(subdir-modorder): $(obj)/%/modules.order: $(obj)/% ;

$(subdir-dtbslist): $(obj)/%/dtbs-list: $(obj)/% ;



#

# Rule to compile a set of .o files into one .a file (without symbol table)
@@ -391,12 +389,8 @@ quiet_cmd_ar_builtin = AR $@ 
$(obj)/built-in.a: $(real-obj-y) FORCE

	$(call if_changed,ar_builtin)



#

# Rule to create modules.order and dtbs-list

#

# This is a list of build artifacts (module or dtb) from the current Makefile

# and its sub-directories. The timestamp should be updated when any of the

# member files.

# This is a list of build artifacts from the current Makefile and its

# sub-directories. The timestamp should be updated when any of the member files.



cmd_gen_order = { $(foreach m, $(real-prereqs), \

	$(if $(filter %/$(notdir $@), $m), cat $m, echo $m);) :; } \
@@ -405,9 +399,6 @@ cmd_gen_order = { $(foreach m, $(real-prereqs), \ 
$(obj)/modules.order: $(obj-m) FORCE

	$(call if_changed,gen_order)



$(obj)/dtbs-list: $(dtb-y) FORCE

	$(call if_changed,gen_order)



#

# Rule to compile a set of .o files into one .a file (with symbol table)

#
@@ -436,11 +427,7 @@ intermediate_targets = $(foreach sfx, $(2), \ 
				$(patsubst %$(strip $(1)),%$(sfx), \

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

# %.asn1.o <- %.asn1.[ch] <- %.asn1

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

# %.dtbo.o <- %.dtbo.S <- %.dtbo <- %.dtso

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

	   $(call intermediate_targets, .dtb.o, .dtb.S .dtb) \

	   $(call intermediate_targets, .dtbo.o, .dtbo.S .dtbo)

targets += $(call intermediate_targets, .asn1.o, .asn1.c .asn1.h)



# Include additional build rules when necessary

# ---------------------------------------------------------------------------
@@ -457,6 +444,10 @@ ifneq ($(userprogs),) 
include $(srctree)/scripts/Makefile.userprogs

endif



ifneq ($(need-dtbslist)$(dtb-y)$(dtb-)$(filter %.dtb %.dtb.o %.dtbo.o,$(targets)),)

include $(srctree)/scripts/Makefile.dtbs

endif



# Build

# ---------------------------------------------------------------------------

scripts/Makefile.dtbs

0 → 100644
+142 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built

dtb-$(CONFIG_OF_ALL_DTBS) += $(dtb-)



# Composite DTB (i.e. DTB constructed by overlay)

multi-dtb-y := $(call multi-search, $(dtb-y), .dtb, -dtbs)

# Primitive DTB compiled from *.dts

real-dtb-y := $(call real-search, $(dtb-y), .dtb, -dtbs)

# Base DTB that overlay is applied onto

base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs))



dtb-y           := $(addprefix $(obj)/, $(dtb-y))

multi-dtb-y     := $(addprefix $(obj)/, $(multi-dtb-y))

real-dtb-y      := $(addprefix $(obj)/, $(real-dtb-y))



always-y        += $(dtb-y)

targets         += $(real-dtb-y)



# dtbs-list

# ---------------------------------------------------------------------------



ifdef need-dtbslist

subdir-dtbslist := $(addsuffix /dtbs-list, $(subdir-ym))

dtb-y           += $(subdir-dtbslist)

always-y        += $(obj)/dtbs-list

endif



$(subdir-dtbslist): $(obj)/%/dtbs-list: $(obj)/% ;



$(obj)/dtbs-list: $(dtb-y) FORCE

	$(call if_changed,gen_order)



# Assembly file to wrap dtb(o)

# ---------------------------------------------------------------------------



# Generate an assembly file to wrap the output of the device tree compiler

quiet_cmd_wrap_S_dtb = WRAP    $@

      cmd_wrap_S_dtb = {								\

		symbase=__$(patsubst .%,%,$(suffix $<))_$(subst -,_,$(notdir $*));	\

		echo '\#include <asm-generic/vmlinux.lds.h>';				\

		echo '.section .dtb.init.rodata,"a"';					\

		echo '.balign STRUCT_ALIGNMENT';					\

		echo ".global $${symbase}_begin";					\

		echo "$${symbase}_begin:";						\

		echo '.incbin "$<" ';							\

		echo ".global $${symbase}_end";						\

		echo "$${symbase}_end:";						\

		echo '.balign STRUCT_ALIGNMENT';					\

	} > $@



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

	$(call if_changed,wrap_S_dtb)



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

	$(call if_changed,wrap_S_dtb)



# Schema check

# ---------------------------------------------------------------------------



ifneq ($(CHECK_DTBS),)

DT_CHECKER ?= dt-validate

DT_CHECKER_FLAGS ?= $(if $(DT_SCHEMA_FILES),-l $(DT_SCHEMA_FILES),-m)

DT_BINDING_DIR := Documentation/devicetree/bindings

DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.json

dtb-check-enabled = $(if $(filter %.dtb, $@),y)

endif



quiet_dtb_check_tag = $(if $(dtb-check-enabled),[C],   )

cmd_dtb_check = $(if $(dtb-check-enabled),; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ || true)



# Overlay

# ---------------------------------------------------------------------------



# NOTE:

# Do not replace $(filter %.dtb %.dtbo, $^) with $(real-prereqs). When a single

# DTB is turned into a multi-blob DTB, $^ will contain header file dependencies

# recorded in the .*.cmd file.

quiet_cmd_fdtoverlay = OVL $(quiet_dtb_check_tag) $@

      cmd_fdtoverlay = $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $(filter %.dtb %.dtbo, $^) $(cmd_dtb_check)



$(multi-dtb-y): $(DT_TMP_SCHEMA) FORCE

	$(call if_changed,fdtoverlay)

$(call multi_depend, $(multi-dtb-y), .dtb, -dtbs)



# DTC

# ---------------------------------------------------------------------------



DTC ?= $(objtree)/scripts/dtc/dtc

DTC_FLAGS += -Wno-unique_unit_address



# Disable noisy checks by default

ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),)

DTC_FLAGS += -Wno-unit_address_vs_reg \

             -Wno-avoid_unnecessary_addr_size \

             -Wno-alias_paths \

             -Wno-graph_child_address \

             -Wno-simple_bus_reg

else

DTC_FLAGS += -Wunique_unit_address_if_enabled

endif



ifneq ($(findstring 2,$(KBUILD_EXTRA_WARN)),)

DTC_FLAGS += -Wnode_name_chars_strict \

             -Wproperty_name_chars_strict \

             -Wunique_unit_address

endif



DTC_FLAGS += $(DTC_FLAGS_$(target-stem))



# Set -@ if the target is a base DTB that overlay is applied onto

DTC_FLAGS += $(if $(filter $(patsubst $(obj)/%,%,$@), $(base-dtb-y)), -@)



DTC_INCLUDE := $(srctree)/scripts/dtc/include-prefixes



dtc_cpp_flags = -Wp,-MMD,$(depfile).pre.tmp -nostdinc -I $(DTC_INCLUDE) -undef -D__DTS__



dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)



quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@

      cmd_dtc = \

	$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \

	$(DTC) -o $@ -b 0 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \

	       $(DTC_FLAGS) -d $(depfile).dtc.tmp $(dtc-tmp) ; \

	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \

	$(cmd_dtb_check)



$(obj)/%.dtb: $(obj)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE

	$(call if_changed_dep,dtc)



$(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE

	$(call if_changed_dep,dtc)



# targets

# ---------------------------------------------------------------------------



targets += $(always-y)



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

# %.dtbo.o <- %.dtbo.S <- %.dtbo <- %.dtso

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

           $(call intermediate_targets, .dtbo.o, .dtbo.S .dtbo)

scripts/Makefile.lib

+0 −115
Original line number Diff line number Diff line
@@ -45,11 +45,6 @@ else 
obj-y		:= $(filter-out %/, $(obj-y))

endif



ifdef need-dtbslist

dtb-y		+= $(addsuffix /dtbs-list, $(subdir-ym))

always-y	+= dtbs-list

endif



# Expand $(foo-objs) $(foo-y) etc. by replacing their individuals

suffix-search = $(strip $(foreach s, $3, $($(1:%$(strip $2)=%$s))))

# List composite targets that are constructed by combining other targets
@@ -80,19 +75,6 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m) 
userprogs += $(userprogs-always-y) $(userprogs-always-m)

always-y += $(userprogs-always-y) $(userprogs-always-m)



# DTB

# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built

dtb-$(CONFIG_OF_ALL_DTBS)       += $(dtb-)



# Composite DTB (i.e. DTB constructed by overlay)

multi-dtb-y := $(call multi-search, $(dtb-y), .dtb, -dtbs)

# Primitive DTB compiled from *.dts

real-dtb-y := $(call real-search, $(dtb-y), .dtb, -dtbs)

# Base DTB that overlay is applied onto

base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs))



always-y			+= $(dtb-y)



# Add subdir path



ifneq ($(obj),.)
@@ -104,9 +86,6 @@ lib-y := $(addprefix $(obj)/,$(lib-y)) 
real-obj-y	:= $(addprefix $(obj)/,$(real-obj-y))

real-obj-m	:= $(addprefix $(obj)/,$(real-obj-m))

multi-obj-m	:= $(addprefix $(obj)/, $(multi-obj-m))

dtb-y		:= $(addprefix $(obj)/, $(dtb-y))

multi-dtb-y	:= $(addprefix $(obj)/, $(multi-dtb-y))

real-dtb-y	:= $(addprefix $(obj)/, $(real-dtb-y))

subdir-ym	:= $(addprefix $(obj)/,$(subdir-ym))

endif
@@ -255,12 +234,6 @@ cpp_flags = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ 


ld_flags       = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F))



DTC_INCLUDE    := $(srctree)/scripts/dtc/include-prefixes



dtc_cpp_flags  = -Wp,-MMD,$(depfile).pre.tmp -nostdinc                    \

		 $(addprefix -I,$(DTC_INCLUDE))                          \

		 -undef -D__DTS__



ifdef CONFIG_OBJTOOL



objtool := $(objtree)/tools/objtool/objtool
@@ -350,94 +323,6 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ 
quiet_cmd_gzip = GZIP    $@

      cmd_gzip = cat $(real-prereqs) | $(KGZIP) -n -f -9 > $@



# DTC

# ---------------------------------------------------------------------------

DTC ?= $(objtree)/scripts/dtc/dtc

DTC_FLAGS += \

	-Wno-unique_unit_address



# Disable noisy checks by default

ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),)

DTC_FLAGS += -Wno-unit_address_vs_reg \

	-Wno-avoid_unnecessary_addr_size \

	-Wno-alias_paths \

	-Wno-graph_child_address \

	-Wno-simple_bus_reg

else

DTC_FLAGS += \

        -Wunique_unit_address_if_enabled

endif



ifneq ($(findstring 2,$(KBUILD_EXTRA_WARN)),)

DTC_FLAGS += -Wnode_name_chars_strict \

	-Wproperty_name_chars_strict \

	-Wunique_unit_address

endif



DTC_FLAGS += $(DTC_FLAGS_$(target-stem))



# Set -@ if the target is a base DTB that overlay is applied onto

DTC_FLAGS += $(if $(filter $(patsubst $(obj)/%,%,$@), $(base-dtb-y)), -@)



# Generate an assembly file to wrap the output of the device tree compiler

quiet_cmd_wrap_S_dtb = WRAP    $@

      cmd_wrap_S_dtb = {								\

		symbase=__$(patsubst .%,%,$(suffix $<))_$(subst -,_,$(notdir $*));	\

		echo '\#include <asm-generic/vmlinux.lds.h>';				\

		echo '.section .dtb.init.rodata,"a"';					\

		echo '.balign STRUCT_ALIGNMENT';					\

		echo ".global $${symbase}_begin";					\

		echo "$${symbase}_begin:";						\

		echo '.incbin "$<" ';							\

		echo ".global $${symbase}_end";						\

		echo "$${symbase}_end:";						\

		echo '.balign STRUCT_ALIGNMENT';					\

	} > $@



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

	$(call if_changed,wrap_S_dtb)



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

	$(call if_changed,wrap_S_dtb)



quiet_dtb_check_tag = $(if $(dtb-check-enabled),[C],   )

cmd_dtb_check = $(if $(dtb-check-enabled),; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ || true)



quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@

cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \

	$(DTC) -o $@ -b 0 \

		$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \

		-d $(depfile).dtc.tmp $(dtc-tmp) ; \

	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \

	$(cmd_dtb_check)



# NOTE:

# Do not replace $(filter %.dtb %.dtbo, $^) with $(real-prereqs). When a single

# DTB is turned into a multi-blob DTB, $^ will contain header file dependencies

# recorded in the .*.cmd file.

quiet_cmd_fdtoverlay = OVL $(quiet_dtb_check_tag) $@

      cmd_fdtoverlay = $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $(filter %.dtb %.dtbo, $^) $(cmd_dtb_check)



$(multi-dtb-y): FORCE

	$(call if_changed,fdtoverlay)

$(call multi_depend, $(multi-dtb-y), .dtb, -dtbs)



ifneq ($(CHECK_DTBS),)

DT_CHECKER ?= dt-validate

DT_CHECKER_FLAGS ?= $(if $(DT_SCHEMA_FILES),-l $(DT_SCHEMA_FILES),-m)

DT_BINDING_DIR := Documentation/devicetree/bindings

DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.json

dtb-check-enabled = $(if $(filter %.dtb, $@),y)

endif



$(obj)/%.dtb: $(obj)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE

	$(call if_changed_dep,dtc)



$(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE

	$(call if_changed_dep,dtc)



dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)



# Bzip2

# ---------------------------------------------------------------------------