Skip to content

Commit a2f0b87

Browse files
committed
Merge tag 'kbuild-fixes-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada: - fix missed rebuild of DT schema check - add some phony targets to PHONY - fix comments and documents * tag 'kbuild-fixes-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: get rid of trailing slash from subdir- example kbuild: add dt_binding_check to PHONY in a correct place kbuild: add dtbs_check to PHONY kbuild: remove unneeded semicolon at the end of cmd_dtb_check kbuild: fix DT binding schema rule to detect command line changes kbuild: remove wrong documentation about mandatory-y kbuild: add comment for V=2 mode
2 parents 278de45 + eabc8bc commit a2f0b87

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

Documentation/kbuild/makefiles.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ is not sufficient this sometimes needs to be explicit.
765765
Example::
766766

767767
#arch/x86/boot/Makefile
768-
subdir- := compressed/
768+
subdir- := compressed
769769

770770
The above assignment instructs kbuild to descend down in the
771771
directory compressed/ when "make clean" is executed.
@@ -1379,9 +1379,6 @@ See subsequent chapter for the syntax of the Kbuild file.
13791379
in arch/$(ARCH)/include/(uapi/)/asm, Kbuild will automatically generate
13801380
a wrapper of the asm-generic one.
13811381

1382-
The convention is to list one subdir per line and
1383-
preferably in alphabetic order.
1384-
13851382
8 Kbuild Variables
13861383
==================
13871384

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ unexport GREP_OPTIONS
6868
#
6969
# If KBUILD_VERBOSE equals 0 then the above command will be hidden.
7070
# If KBUILD_VERBOSE equals 1 then the above command is displayed.
71+
# If KBUILD_VERBOSE equals 2 then give the reason why each target is rebuilt.
7172
#
7273
# To put more focus on warnings, be less verbose as default
7374
# Use 'make V=1' to see the full commands
@@ -1238,7 +1239,7 @@ ifneq ($(dtstree),)
12381239
%.dtb: include/config/kernel.release scripts_dtc
12391240
$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
12401241

1241-
PHONY += dtbs dtbs_install dt_binding_check
1242+
PHONY += dtbs dtbs_install dtbs_check
12421243
dtbs dtbs_check: include/config/kernel.release scripts_dtc
12431244
$(Q)$(MAKE) $(build)=$(dtstree)
12441245

@@ -1258,6 +1259,7 @@ PHONY += scripts_dtc
12581259
scripts_dtc: scripts_basic
12591260
$(Q)$(MAKE) $(build)=scripts/dtc
12601261

1262+
PHONY += dt_binding_check
12611263
dt_binding_check: scripts_dtc
12621264
$(Q)$(MAKE) $(build)=Documentation/devicetree/bindings
12631265

scripts/Makefile.lib

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,15 +300,15 @@ DT_BINDING_DIR := Documentation/devicetree/bindings
300300
DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml
301301

302302
quiet_cmd_dtb_check = CHECK $@
303-
cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ ;
303+
cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@
304304

305-
define rule_dtc_dt_yaml
305+
define rule_dtc
306306
$(call cmd_and_fixdep,dtc,yaml)
307307
$(call cmd,dtb_check)
308308
endef
309309

310310
$(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
311-
$(call if_changed_rule,dtc_dt_yaml)
311+
$(call if_changed_rule,dtc)
312312

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

0 commit comments

Comments
 (0)