Commit 2047ace9 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: use always-y instead of extra-y 



As commit d0e628cd ("kbuild: doc: clarify the difference between
extra-y and always-y") explained, extra-y should be used for listing
the prerequisites of vmlinux.

These targets are not related to vmlinux. always-y is a better fix.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
parent 0dd77e95

Documentation/devicetree/bindings/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ $(obj)/processed-schema.json: $(DT_SCHEMA_FILES) check_dtschema_version FORCE 


endif



extra-$(CHECK_DT_BINDING) += processed-schema-examples.json

extra-$(CHECK_DTBS) += processed-schema.json

extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))

always-$(CHECK_DT_BINDING) += processed-schema-examples.json

always-$(CHECK_DTBS)       += processed-schema.json

always-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

always-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))



# Hack: avoid 'Argument list too long' error for 'make clean'. Remove most of

# build artifacts here before they are processed by scripts/Makefile.clean

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ no-header-test := \ 
	gvt/mpt.h \

	gvt/scheduler.h



extra-$(CONFIG_DRM_I915_WERROR) += \

always-$(CONFIG_DRM_I915_WERROR) += \

	$(patsubst %.h,%.hdrtest, $(filter-out $(no-header-test), \

		$(shell cd $(srctree)/$(src) && find * -name '*.h')))

scripts/Makefile.lib

+5 −5
Original line number Diff line number Diff line
@@ -81,12 +81,12 @@ always-y += $(userprogs-always-y) $(userprogs-always-m) 


# DTB

# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built

extra-y				+= $(dtb-y)

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

always-y			+= $(dtb-y)

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



ifneq ($(CHECK_DTBS),)

extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))

extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))

always-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))

always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))

endif



# Add subdir path
@@ -247,7 +247,7 @@ $(obj)/%: $(src)/%_shipped 
#	target: source(s) FORCE

#		$(if_changed,ld/objcopy/gzip)

#

#	and add target to extra-y so that we know we have to

#	and add target to 'targets' so that we know we have to

#	read in the saved command line



# Linking

scripts/gdb/linux/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ symlinks := $(patsubst $(srctree)/$(src)/%,%,$(wildcard $(srctree)/$(src)/*.py)) 
quiet_cmd_symlink = SYMLINK $@

      cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(abspath $(srctree))/$(src)/%,$@) $@



extra-y += $(symlinks)

always-y += $(symlinks)

$(addprefix $(obj)/, $(symlinks)): FORCE

	$(call if_changed,symlink)
@@ -18,7 +18,7 @@ quiet_cmd_gen_constants_py = GEN $@ 
	$(CPP) -E -x c -P $(c_flags) $< > $@ ;\

	sed -i '1,/<!-- end-c-headers -->/d;' $@



extra-y += constants.py

always-y += constants.py

$(obj)/constants.py: $(src)/constants.py.in FORCE

	$(call if_changed_dep,gen_constants_py)