[GIT PULL] dts, kbuild: Implement support for dtb vendor subdirs
From: rric@kernel.org (Robert Richter)
Date: 2014-10-21 18:15:13
Also in:
linux-devicetree, linux-kbuild, lkml
Arnd, On 05.09.14 08:48:06, Robert Richter wrote:
From: Robert Richter <redacted> For arm64 we want to put dts files into vendor's subdirectories from the beginning. This patch set implements this. As this is a generic kbuild implementation, vendor subdirs will be also available for arch/arm and other architectures. The subdirectory tree is also reflected in the install path. A new makefile variable dts-dirs is introduced to point to dts subdirs. This variable is used by kbuild for building and installation of dtb files. A dts Makefile looks now as follows: ---- dtb-$(CONFIG_...) += some_file_1.dtb dtb-$(CONFIG_...) += some_file_2.dtb dts-dirs += dir_vendor_a dts-dirs += dir_vendor_b # come always afterwards: always := $(dtb-y) subdir-y := $(dts-dirs) clean-files := *.dtb ---- This patches also introduces the dtbs_install make target for arm64. Install rules are moved to Makefile.dtbinst using the same style and calling convention like for modinst and fwinst. Robert Richter (6): dts, arm64: Add dtbs_install make target dts, kbuild: Factor out dtbs install rules to Makefile.dtbinst dts, arm/arm64: Remove dtbs build rules in sub-makes dts, kbuild: Implement support for dtb vendor subdirs dts, arm64: Move dts files to vendor subdirs dts, arm: Remove $(MACHINE) variable from dtbs make recipes
please pull this series for inclusion into v3.19 from:
git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git dts-subdirs-for-arm-soc-v3.19
I have updated and rebased the patches to v3.18-rc1. No changes except
conflict resolution of patch 5/6.
Thanks,
-Robert
The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git dts-subdirs-for-arm-soc-v3.19
for you to fetch changes up to 6f889d8ba125693778e05f0166b963cf08fed930:
dts, arm: Remove $(MACHINE) variable from dtbs make recipes (2014-10-21 18:07:00 +0200)
----------------------------------------------------------------
dts, kbuild: Implement support for dtb vendor subdirs
----------------------------------------------------------------
Robert Richter (6):
dts, arm64: Add dtbs_install make target
dts, kbuild: Factor out dtbs install rules to Makefile.dtbinst
dts, arm/arm64: Remove dtbs build rules in sub-makes
dts, kbuild: Implement support for dtb vendor subdirs
dts, arm64: Move dts files to vendor subdirs
dts, arm: Remove $(MACHINE) variable from dtbs make recipes
arch/arm/Makefile | 8 +++-
arch/arm/boot/dts/Makefile | 12 +----
arch/arm64/Makefile | 10 ++++-
arch/arm64/boot/dts/Makefile | 15 +++----
arch/arm64/boot/dts/apm/Makefile | 5 +++
arch/arm64/boot/dts/{ => apm}/apm-mustang.dts | 0
arch/arm64/boot/dts/{ => apm}/apm-storm.dtsi | 0
arch/arm64/boot/dts/arm/Makefile | 6 +++
arch/arm64/boot/dts/{ => arm}/foundation-v8.dts | 0
arch/arm64/boot/dts/{ => arm}/rtsm_ve-aemv8a.dts | 0
.../boot/dts/{ => arm}/rtsm_ve-motherboard.dtsi | 0
arch/arm64/boot/dts/cavium/Makefile | 5 +++
arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dts | 0
arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dtsi | 0
scripts/Kbuild.include | 6 +++
scripts/Makefile.dtbinst | 51 ++++++++++++++++++++++
scripts/Makefile.lib | 12 -----
17 files changed, 95 insertions(+), 35 deletions(-)
create mode 100644 arch/arm64/boot/dts/apm/Makefile
rename arch/arm64/boot/dts/{ => apm}/apm-mustang.dts (100%)
rename arch/arm64/boot/dts/{ => apm}/apm-storm.dtsi (100%)
create mode 100644 arch/arm64/boot/dts/arm/Makefile
rename arch/arm64/boot/dts/{ => arm}/foundation-v8.dts (100%)
rename arch/arm64/boot/dts/{ => arm}/rtsm_ve-aemv8a.dts (100%)
rename arch/arm64/boot/dts/{ => arm}/rtsm_ve-motherboard.dtsi (100%)
create mode 100644 arch/arm64/boot/dts/cavium/Makefile
rename arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dts (100%)
rename arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dtsi (100%)
create mode 100644 scripts/Makefile.dtbinst