From: Maxime Ripard Date: Thu, 14 Feb 2013 04:27:54 +0000 (+0000) Subject: linux: Install the device tree in /boot when installing the kernel X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=88d350ca3ccdd91fd78ecf3e24e31e27726c5bc8;p=buildroot.git 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 Signed-off-by: Peter Korsgaard --- diff --git a/linux/linux.mk b/linux/linux.mk index 91a9f500bb..0352acd505 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