[meta-lsi] [PATCH 65/86] linux-yocto: Modify dtb files path for ARM 3.10

[Daniel Dragomir]

- When compiling ARM 3.10 kernels, the dtb files are created in a
different path. Adapt this path to found the dtb files.
- Do not create fit image for axm55xxemu7 because the dts was
deleted. The version of emulation that used this device tree is
no longer supported.

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
 recipes-kernel/linux/linux-yocto.inc | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/recipes-kernel/linux/linux-yocto.inc b/recipes-kernel/linux/linux-yocto.inc
index 45e7b0f..50759a0 100644
--- a/recipes-kernel/linux/linux-yocto.inc
+++ b/recipes-kernel/linux/linux-yocto.inc
@@ -17,11 +17,20 @@ mk_fit_images() {
 	oe_runmake ${name}.dtb
 	echo "pwd = `pwd`"
 	cd ../fit
-	oe_runmake "ARCH=${KARCH}" \
-			'DESCRIPTION=LSI Axxia Linux' \
-			"ADDRESS=${addr}" \
-			'VMLINUX=${B}/vmlinux' \
-			"DTB=${B}/arch/${KARCH}/boot/${name}.dtb"
+	if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]
+	then
+		oe_runmake "ARCH=${KARCH}" \
+				'DESCRIPTION=LSI Axxia Linux' \
+				"ADDRESS=${addr}" \
+				'VMLINUX=${B}/vmlinux' \
+				"DTB=${B}/arch/${KARCH}/boot/dts/${name}.dtb"
+	else
+		oe_runmake "ARCH=${KARCH}" \
+       	                        'DESCRIPTION=LSI Axxia Linux' \
+               	                "ADDRESS=${addr}" \
+                       	        'VMLINUX=${B}/vmlinux' \
+                               	"DTB=${B}/arch/${KARCH}/boot/${name}.dtb"
+	fi
 	mv linux.fit linux.fit-${name}
 	mv fdt.fit fdt.fit-${name}
 	mv multi.fit multi.fit-${name}
@@ -58,14 +67,18 @@ do_compile_append() {
 			mk_fit_images "axm5507-emu" ${addr}
 			mk_fit_images "axm5516-amarillo" ${addr}
 			mk_fit_images "axm5516-sim" ${addr}
-			mk_fit_images "axm55xxemu7" ${addr}
 		fi
 	fi
 }
 
 install_fit_images() {
 	name=$1
-	install ${B}/arch/${KARCH}/boot/${name}.dtb ${DEPLOYDIR}/${name}.dtb
+	if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]
+	then
+		install ${B}/arch/${KARCH}/boot/dts/${name}.dtb ${DEPLOYDIR}/${name}.dtb
+	else
+		install ${B}/arch/${KARCH}/boot/${name}.dtb ${DEPLOYDIR}/${name}.dtb
+	fi
 	install ${B}/../fit/linux.fit-${name} ${DEPLOYDIR}/linux.fit-${name}
 	install ${B}/../fit/fdt.fit-${name} ${DEPLOYDIR}/fdt.fit-${name}
 	install ${B}/../fit/multi.fit-${name} ${DEPLOYDIR}/multi.fit-${name}
@@ -100,7 +113,6 @@ do_deploy_append() {
 			install_fit_images "axm5507-emu"
 			install_fit_images "axm5516-amarillo"
 			install_fit_images "axm5516-sim"
-			install_fit_images "axm55xxemu7"
     	fi
     fi
 }
-- 
1.8.1.4