Skip to content

Commit 2047ace

Browse files
committed
kbuild: use always-y instead of extra-y
As commit d0e628c ("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: Masahiro Yamada <[email protected]> Reviewed-by: Rob Herring <[email protected]>
1 parent 0dd77e9 commit 2047ace

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

Documentation/devicetree/bindings/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ $(obj)/processed-schema.json: $(DT_SCHEMA_FILES) check_dtschema_version FORCE
7878

7979
endif
8080

81-
extra-$(CHECK_DT_BINDING) += processed-schema-examples.json
82-
extra-$(CHECK_DTBS) += processed-schema.json
83-
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
84-
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
81+
always-$(CHECK_DT_BINDING) += processed-schema-examples.json
82+
always-$(CHECK_DTBS) += processed-schema.json
83+
always-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
84+
always-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
8585

8686
# Hack: avoid 'Argument list too long' error for 'make clean'. Remove most of
8787
# build artifacts here before they are processed by scripts/Makefile.clean

drivers/gpu/drm/i915/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ no-header-test := \
294294
gvt/mpt.h \
295295
gvt/scheduler.h
296296

297-
extra-$(CONFIG_DRM_I915_WERROR) += \
297+
always-$(CONFIG_DRM_I915_WERROR) += \
298298
$(patsubst %.h,%.hdrtest, $(filter-out $(no-header-test), \
299299
$(shell cd $(srctree)/$(src) && find * -name '*.h')))
300300

scripts/Makefile.lib

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ always-y += $(userprogs-always-y) $(userprogs-always-m)
8181

8282
# DTB
8383
# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
84-
extra-y += $(dtb-y)
85-
extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
84+
always-y += $(dtb-y)
85+
always-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
8686

8787
ifneq ($(CHECK_DTBS),)
88-
extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
89-
extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
88+
always-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
89+
always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
9090
endif
9191

9292
# Add subdir path
@@ -247,7 +247,7 @@ $(obj)/%: $(src)/%_shipped
247247
# target: source(s) FORCE
248248
# $(if_changed,ld/objcopy/gzip)
249249
#
250-
# and add target to extra-y so that we know we have to
250+
# and add target to 'targets' so that we know we have to
251251
# read in the saved command line
252252

253253
# Linking

scripts/gdb/linux/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ symlinks := $(patsubst $(srctree)/$(src)/%,%,$(wildcard $(srctree)/$(src)/*.py))
77
quiet_cmd_symlink = SYMLINK $@
88
cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(abspath $(srctree))/$(src)/%,$@) $@
99

10-
extra-y += $(symlinks)
10+
always-y += $(symlinks)
1111
$(addprefix $(obj)/, $(symlinks)): FORCE
1212
$(call if_changed,symlink)
1313

@@ -18,7 +18,7 @@ quiet_cmd_gen_constants_py = GEN $@
1818
$(CPP) -E -x c -P $(c_flags) $< > $@ ;\
1919
sed -i '1,/<!-- end-c-headers -->/d;' $@
2020

21-
extra-y += constants.py
21+
always-y += constants.py
2222
$(obj)/constants.py: $(src)/constants.py.in FORCE
2323
$(call if_changed_dep,gen_constants_py)
2424

0 commit comments

Comments
 (0)