summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-02-14 04:27:54 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-02-19 22:30:10 (GMT)
commit88d350ca3ccdd91fd78ecf3e24e31e27726c5bc8 (patch)
tree29d2f1f1353e6dafa27bfe95a94b96b66cc1e908
parent8290a6261aaa4af8e8a4b3cbd6c8bedd83622572 (diff)
downloadbuildroot-88d350ca3ccdd91fd78ecf3e24e31e27726c5bc8.tar.gz
buildroot-88d350ca3ccdd91fd78ecf3e24e31e27726c5bc8.tar.bz2
linux: Install the device tree in /boot when installing the kernel
The option BR2_LINUX_KERNEL_INSTALL_TARGET used to install the kernel in /boot in the rootfs. The introduction of the device tree builds made it possible to generate device tree blobs, and stored them in IMAGES_DIR like the kernel, but didn't copy the dtb in /boot when _INSTALL_TARGET was enabled. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--linux/linux.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index 91a9f50..0352acd 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -198,6 +198,13 @@ define LINUX_INSTALL_DTB
$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
$(BINARIES_DIR)/
endef
+define LINUX_INSTALL_DTB_TARGET
+ # dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
+ cp $(addprefix \
+ $(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
+ $(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
+ $(TARGET_DIR)/boot/
+endef
endif
endif
@@ -234,6 +241,7 @@ endef
ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y)
define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET
install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
+ $(LINUX_INSTALL_DTB_TARGET)
endef
endif