diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-12-01 18:56:28 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-02-20 10:53:39 -0500 |
commit | f4d4ffc03efc864645b990e1d579bbe1b8e358a4 (patch) | |
tree | 6251d7baf9fb1e92e0712611319ff10118c9311e /arch/arm/Makefile | |
parent | c8a4c63f8c136d3368625d640f2dd1cb505f1fea (diff) |
kbuild: dtbs_install: new make target
Unlike other build products in the Linux kernel, there is no 'make
*install' mechanism to put devicetree blobs in a standard place.
This commit adds a new 'dtbs_install' make target which copies all of
the dtbs into the INSTALL_DTBS_PATH directory. INSTALL_DTBS_PATH can be
set before calling make to change the default install directory. If not
set then it defaults to:
$INSTALL_PATH/dtbs/$KERNELRELEASE.
This is done to keep dtbs from different kernel versions separate until
things have settled down. Once the dtbs are stable, and not so strongly
linked to the kernel version, the devicetree files will most likely move
to their own repo. Users will need to upgrade install scripts at that
time.
v7: (reworked by Grant Likely)
- Moved rules from arch/arm/Makefile to arch/arm/boot/dts/Makefile so
that each dtb install could have a separate target and be reported as
part of the make output.
- Fixed dependency problem to ensure $KERNELRELEASE is calculated before
attempting to install
- Removed option to call external script. Copying the files should be
sufficient and a build system can post-process the install directory.
Despite the fact an external script is used for installing the kernel,
I don't think that is a pattern that should be encouraged. I would
rather see buildroot type tools post process the install directory to
rename or move dtb files after installing to a staging directory.
- Plus it is easy to add a hook after the fact without blocking the
rest of this feature.
- Move the helper targets into scripts/Makefile.lib with the rest of the
common dtb rules
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Rob Herring <robh+dt@kernel.org>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 08a9ef58d9c3..fddf4beaee45 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -310,9 +310,9 @@ $(INSTALL_TARGETS): | |||
310 | %.dtb: | scripts | 310 | %.dtb: | scripts |
311 | $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ | 311 | $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ |
312 | 312 | ||
313 | PHONY += dtbs | 313 | PHONY += dtbs dtbs_install |
314 | dtbs: scripts | 314 | dtbs dtbs_install: prepare scripts |
315 | $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs | 315 | $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@ |
316 | 316 | ||
317 | # We use MRPROPER_FILES and CLEAN_FILES now | 317 | # We use MRPROPER_FILES and CLEAN_FILES now |
318 | archclean: | 318 | archclean: |
@@ -331,6 +331,7 @@ define archhelp | |||
331 | echo ' bootpImage - Combined zImage and initial RAM disk' | 331 | echo ' bootpImage - Combined zImage and initial RAM disk' |
332 | echo ' (supply initrd image via make variable INITRD=<path>)' | 332 | echo ' (supply initrd image via make variable INITRD=<path>)' |
333 | echo '* dtbs - Build device tree blobs for enabled boards' | 333 | echo '* dtbs - Build device tree blobs for enabled boards' |
334 | echo ' dtbs_install - Install dtbs to $(INSTALL_DTBS_PATH)' | ||
334 | echo ' install - Install uncompressed kernel' | 335 | echo ' install - Install uncompressed kernel' |
335 | echo ' zinstall - Install compressed kernel' | 336 | echo ' zinstall - Install compressed kernel' |
336 | echo ' uinstall - Install U-Boot wrapped compressed kernel' | 337 | echo ' uinstall - Install U-Boot wrapped compressed kernel' |