From: Ting Liu <ting.liu@nxp.com>
Date: Fri, 12 Aug 2016 10:43:49 +0000 (+0800)
Subject: linux-qoriq: fix build path of the dtb
X-Git-Tag: 2.2~301
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=63c4151083e8bca01607b61089d1e0634809c9fb;p=meta-freescale.git

linux-qoriq: fix build path of the dtb

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/recipes-kernel/linux/linux-qoriq/powerpc-fsl-Fix-build-of-the-dtb-embedded-kernel-images.patch b/recipes-kernel/linux/linux-qoriq/powerpc-fsl-Fix-build-of-the-dtb-embedded-kernel-images.patch
new file mode 100644
index 00000000..1103f0c2
--- /dev/null
+++ b/recipes-kernel/linux/linux-qoriq/powerpc-fsl-Fix-build-of-the-dtb-embedded-kernel-images.patch
@@ -0,0 +1,45 @@
+From 4680c9d50637f78338e786c920aef6c171c7cc00 Mon Sep 17 00:00:00 2001
+From: Alessio Igor Bogani <alessio.bogani@elettra.eu>
+Date: Mon, 18 Apr 2016 08:36:19 +0200
+Subject: powerpc/fsl: Fix build of the dtb embedded kernel images
+
+Commit dc37374b9c833 ("powerpc/fsl: Move Freescale device tree files
+into fsl folder") moved a lot of device tree files into fsl directory,
+fixing Makefile for cuImage target only.  Unfortunately there are other
+targets which require embedding a device tree into the kernel image
+(e.g. dtbImage.%).  So use a more generic approach.
+
+Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
+[scottwood: cleaned up commit message]
+Signed-off-by: Scott Wood <oss@buserror.net>
+---
+ arch/powerpc/boot/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
+index 6116510..8fe78a3 100644
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -362,9 +362,6 @@ $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+ $(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+ 	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
+ 
+-$(obj)/cuImage.%: vmlinux $(obj)/fsl/%.dtb $(wrapperbits)
+-	$(call if_changed,wrap,cuboot-$*,,$(obj)/fsl/$*.dtb)
+-
+ $(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+ 	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+ 
+@@ -381,6 +378,9 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+ $(obj)/%.dtb: $(src)/dts/%.dts FORCE
+ 	$(call if_changed_dep,dtc)
+ 
++$(obj)/%.dtb: $(src)/dts/fsl/%.dts FORCE
++	$(call if_changed_dep,dtc)
++
+ # If there isn't a platform selected then just strip the vmlinux.
+ ifeq (,$(image-y))
+ image-y := vmlinux.strip
+-- 
+cgit v0.12
+
diff --git a/recipes-kernel/linux/linux-qoriq_4.1.bb b/recipes-kernel/linux/linux-qoriq_4.1.bb
index 198d1562..5a5693e9 100644
--- a/recipes-kernel/linux/linux-qoriq_4.1.bb
+++ b/recipes-kernel/linux/linux-qoriq_4.1.bb
@@ -12,6 +12,7 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v2.0.x \
     file://0003-use-static-inline-in-ARM-lifeboot.h.patch \
     file://fix-the-compile-issue-under-gcc6.patch \
     file://only-set-vmpic_msi_feature-if-CONFIG_EPAPR_PARAVIRT-.patch \
+    file://powerpc-fsl-Fix-build-of-the-dtb-embedded-kernel-images.patch \
 "
 SRCREV = "bd51baffc04ecc73f933aee1c3a37c8b44b889a7"