diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 15:17:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 15:17:09 -0500 |
| commit | 9bbd4b9f38f56b4ee2c8ff268a1104ff38333e90 (patch) | |
| tree | 7e889c87c06165e553fdc9056b9fa4d91b91a5ee /arch/metag | |
| parent | 3e069adabc9487b5e28065a17e6a228da3412dfd (diff) | |
| parent | 2d799dde8e69494e0234b8ecd5ce95cd06224329 (diff) | |
Merge tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree updates from Rob Herring:
"A fairly large (by DT standards) pull request this time with the
majority being some overdue moving DT binding docs around to
consolidate similar bindings.
- DT binding doc consolidation moving similar bindings to common
locations. The majority of these are display related which were
scattered in video/, fb/, drm/, gpu/, and panel/ directories.
- Add new config option, CONFIG_OF_ALL_DTBS, to enable building all
dtbs in the tree for most arches with dts files (except powerpc for
now).
- OF_IRQ=n fixes for user enabled CONFIG_OF.
- of_node_put ref counting fixes from Julia Lawall.
- Common DT binding for wakeup-source and deprecation of all similar
bindings.
- DT binding for PXA LCD controller.
- Allow ignoring failed PCI resource translations in order to ignore
64-bit addresses on non-LPAE 32-bit kernels.
- Support setting the NUMA node from DT instead of only from parent
device.
- Couple of earlycon DT parsing fixes for address and options"
* tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (45 commits)
MAINTAINERS: update DT binding doc locations
devicetree: add Sigma Designs vendor prefix
of: simplify arch_find_n_match_cpu_physical_id() function
Documentation: arm: Fixed typo in socfpga fpga mgr example
Documentation: devicetree: fix reference to legacy wakeup properties
Documentation: devicetree: standardize/consolidate on "wakeup-source" property
drivers: of: removing assignment of 0 to static variable
xtensa: enable building of all dtbs
mips: enable building of all dtbs
metag: enable building of all dtbs
metag: use common make variables for dtb builds
h8300: enable building of all dtbs
arm64: enable building of all dtbs
arm: enable building of all dtbs
arc: enable building of all dtbs
arc: use common make variables for dtb builds
of: add config option to enable building of all dtbs
of/fdt: fix error checking for earlycon address
of/overlay: add missing of_node_put
of/platform: add missing of_node_put
...
Diffstat (limited to 'arch/metag')
| -rw-r--r-- | arch/metag/Makefile | 2 | ||||
| -rw-r--r-- | arch/metag/boot/dts/Makefile | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/metag/Makefile b/arch/metag/Makefile index 9739857bdedc..033a58214119 100644 --- a/arch/metag/Makefile +++ b/arch/metag/Makefile | |||
| @@ -72,7 +72,7 @@ $(boot_targets): vmlinux | |||
| 72 | $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ | 72 | $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ |
| 73 | 73 | ||
| 74 | dtbs: scripts | 74 | dtbs: scripts |
| 75 | $(Q)$(MAKE) $(build)=$(boot)/dts dtbs | 75 | $(Q)$(MAKE) $(build)=$(boot)/dts |
| 76 | 76 | ||
| 77 | archclean: | 77 | archclean: |
| 78 | $(Q)$(MAKE) $(clean)=$(boot) | 78 | $(Q)$(MAKE) $(clean)=$(boot) |
diff --git a/arch/metag/boot/dts/Makefile b/arch/metag/boot/dts/Makefile index 72c121879426..097c6da4547f 100644 --- a/arch/metag/boot/dts/Makefile +++ b/arch/metag/boot/dts/Makefile | |||
| @@ -12,11 +12,10 @@ endif | |||
| 12 | dtb-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb | 12 | dtb-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb |
| 13 | obj-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb.o | 13 | obj-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb.o |
| 14 | 14 | ||
| 15 | targets += dtbs | 15 | dtstree := $(srctree)/$(src) |
| 16 | targets += $(dtb-y) | 16 | dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) |
| 17 | 17 | ||
| 18 | .SECONDARY: $(obj)/$(builtindtb-y).dtb.S | 18 | .SECONDARY: $(obj)/$(builtindtb-y).dtb.S |
| 19 | 19 | ||
| 20 | dtbs: $(addprefix $(obj)/, $(dtb-y)) | 20 | always += $(dtb-y) |
| 21 | |||
| 22 | clean-files += *.dtb *.dtb.S | 21 | clean-files += *.dtb *.dtb.S |
