Pull devicetree updates from Rob Herring: - Refactor powerpc and arm64 kexec DT handling to common code. This enables IMA on arm64. - Add kbuild support for applying DT overlays at build time. The first user are the DT unittests. - Fix kerneldoc formatting and W=1 warnings in drivers/of/ - Fix handling 64-bit flag on PCI resources - Bump dtschema version required to v2021.2.1 - Enable undocumented compatible checks for dtbs_check. This allows tracking of missing binding schemas. - DT docs improvements. Regroup the DT docs and add the example schema and DT kernel ABI docs to the doc build. - Convert Broadcom Bluetooth and video-mux bindings to schema - Add QCom sm8250 Venus video codec binding schema - Add vendor prefixes for AESOP, YIC System Co., Ltd, and Siliconfile Technologies Inc. - Cleanup of DT schema type references on common properties and standard unit properties * tag 'devicetree-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (64 commits) powerpc: If kexec_build_elf_info() fails return immediately from elf64_load() powerpc: Free fdt on error in elf64_load() of: overlay: Fix kerneldoc warning in of_overlay_remove() of: linux/of.h: fix kernel-doc warnings of/pci: Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses dt-bindings: bcm4329-fmac: add optional brcm,ccode-map docs: dt: update writing-schema.rst references dt-bindings: media: venus: Add sm8250 dt schema of: base: Fix spelling issue with function param 'prop' docs: dt: Add DT API documentation of: Add missing 'Return' section in kerneldoc comments of: Fix kerneldoc output formatting docs: dt: Group DT docs into relevant sub-sections docs: dt: Make 'Devicetree' wording more consistent docs: dt: writing-schema: Include the example schema in the doc build docs: dt: writing-schema: Remove spurious indentation dt-bindings: Fix reference in submitting-patches.rst to the DT ABI doc dt-bindings: ddr: Add optional manufacturer and revision ID to LPDDR3 dt-bindings: media: video-interfaces: Drop the example devicetree: bindings: clock: Minor typo fix in the file armada3700-tbg-clock.txt ...
Showing the changes to scripts (2 of 102 files). Show all
Unified · Split
| @@ -73,14 +73,26 @@ always-y += $(userprogs-always-y) $(userprogs-always-m) · 72 unmodified lines | |||
| 73 | 73 | ||
| 74 | # DTB | 74 | # DTB |
| 75 | # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built | 75 | # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built |
| 76 | dtb-$(CONFIG_OF_ALL_DTBS) += $(dtb-) | ||
| 77 | |||
| 78 | # List all dtbs to be generated by fdtoverlay | ||
| 79 | overlay-y := $(foreach m,$(dtb-y), $(if $(strip $($(m:.dtb=-dtbs))),$(m),)) | ||
| 80 | |||
| 81 | # Generate symbols for the base files so overlays can be applied to them. | ||
| 82 | $(foreach m,$(overlay-y), $(eval DTC_FLAGS_$(basename $(firstword $($(m:.dtb=-dtbs)))) += -@)) | ||
| 83 | |||
| 84 | # Add base dtb and overlay dtbo | ||
| 85 | dtb-y += $(foreach m,$(overlay-y), $($(m:.dtb=-dtbs))) | ||
| 86 | |||
| 76 | always-y += $(dtb-y) | 87 | always-y += $(dtb-y) |
| 77 | always-$(CONFIG_OF_ALL_DTBS) += $(dtb-) | ||
| 78 | 88 | ||
| 79 | ifneq ($(CHECK_DTBS),) | 89 | ifneq ($(CHECK_DTBS),) |
| 80 | always-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y)) | 90 | # Don't run schema checks for dtbs created by fdtoverlay as they don't |
| 81 | always-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y)) | 91 | # have corresponding dts files. |
| 82 | always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-)) | 92 | dt-yaml-y := $(filter-out $(overlay-y),$(dtb-y)) |
| 83 | always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-)) | 93 | |
| 94 | always-y += $(patsubst %.dtb,%.dt.yaml, $(dt-yaml-y)) | ||
| 95 | always-y += $(patsubst %.dtbo,%.dt.yaml, $(dt-yaml-y)) | ||
| 84 | endif | 96 | endif |
| 85 | 97 | ||
| 86 | # Add subdir path | 98 | # Add subdir path |
| @@ -338,13 +350,23 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE · 251 unmodified lines | |||
| 338 | $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE | 350 | $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE |
| 339 | $(call if_changed_dep,dtc) | 351 | $(call if_changed_dep,dtc) |
| 340 | 352 | ||
| 353 | overlay-y := $(addprefix $(obj)/, $(overlay-y)) | ||
| 354 | |||
| 355 | quiet_cmd_fdtoverlay = DTOVL $@ | ||
| 356 | cmd_fdtoverlay = $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $(real-prereqs) | ||
| 357 | |||
| 358 | $(overlay-y): FORCE | ||
| 359 | $(call if_changed,fdtoverlay) | ||
| 360 | $(call multi_depend, $(overlay-y), .dtb, -dtbs) | ||
| 361 | |||
| 341 | DT_CHECKER ?= dt-validate | 362 | DT_CHECKER ?= dt-validate |
| 363 | DT_CHECKER_FLAGS ?= $(if $(DT_SCHEMA_FILES),,-m) | ||
| 342 | DT_BINDING_DIR := Documentation/devicetree/bindings | 364 | DT_BINDING_DIR := Documentation/devicetree/bindings |
| 343 | # DT_TMP_SCHEMA may be overridden from Documentation/devicetree/bindings/Makefile | 365 | # DT_TMP_SCHEMA may be overridden from Documentation/devicetree/bindings/Makefile |
| 344 | DT_TMP_SCHEMA ?= $(objtree)/$(DT_BINDING_DIR)/processed-schema.json | 366 | DT_TMP_SCHEMA ?= $(objtree)/$(DT_BINDING_DIR)/processed-schema.json |
| 345 | 367 | ||
| 346 | quiet_cmd_dtb_check = CHECK $@ | 368 | quiet_cmd_dtb_check = CHECK $@ |
| 347 | cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ | 369 | cmd_dtb_check = $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ |
| 348 | 370 | ||
| 349 | define rule_dtc | 371 | define rule_dtc |
| 350 | $(call cmd_and_fixdep,dtc) | 372 | $(call cmd_and_fixdep,dtc) |
| @@ -3245,7 +3245,7 @@ sub process { · 3244 unmodified lines | |||
| 3245 | ($line =~ /^new file mode\s*\d+\s*$/) && | 3245 | ($line =~ /^new file mode\s*\d+\s*$/) && |
| 3246 | ($realfile =~ m@^Documentation/devicetree/bindings/.*\.txt$@)) { | 3246 | ($realfile =~ m@^Documentation/devicetree/bindings/.*\.txt$@)) { |
| 3247 | WARN("DT_SCHEMA_BINDING_PATCH", | 3247 | WARN("DT_SCHEMA_BINDING_PATCH", |
| 3248 | "DT bindings should be in DT schema format. See: Documentation/devicetree/writing-schema.rst\n"); | 3248 | "DT bindings should be in DT schema format. See: Documentation/devicetree/bindings/writing-schema.rst\n"); |
| 3249 | } | 3249 | } |
| 3250 | 3250 | ||
| 3251 | # Check for wrappage within a valid hunk of the file | 3251 | # Check for wrappage within a valid hunk of the file |