commit BSP v1.8.0

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

1 files changed, 61 insertions, 0 deletions

diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-dtb-append.inc b/meta-rcar-gen2/recipes-kernel/linux/linux-dtb-append.inc
new file mode 100644
index 0000000..725f377
--- /dev/null
+++ b/meta-rcar-gen2/recipes-kernel/linux/linux-dtb-append.inc
@@ -0,0 +1,61 @@
+do_install_append() {
+	if [ ! -n "${KERNEL_DEVICETREE}" ]; then
+		echo "Device tree does not support"
+		exit
+	fi
+
+	for DTS_FILE in ${KERNEL_DEVICETREE}; do
+		if [ ! -f ${DTS_FILE} ]; then
+			echo "Warning: ${DTS_FILE} is not available!"
+			continue
+		fi
+		DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+		if [ ! -f arch/${ARCH}/boot/dts/${DTS_BASE_NAME}.dtb ]; then
+			echo "Warning: ${DTS_BASE_NAME}.dtb is not available!"
+			continue
+		fi
+		# create zImage (for bootz)
+		cat arch/${ARCH}/boot/zImage arch/${ARCH}/boot/dts/${DTS_BASE_NAME}.dtb > arch/${ARCH}/boot/zImage+dtb
+		# create uImage
+		$(cut -f 3- -d ' ' < arch/${ARCH}/boot/.uImage.cmd | sed -e 's/zImage/zImage+dtb/g' -e 's/uImage/uImage+dtb/g')
+	done
+}
+
+do_deploy_append() {
+	# zImage
+	if [ -f ${B}/arch/${ARCH}/boot/zImage -a "${KERNEL_IMAGETYPE}" != "zImage" ]; then
+		ZIMAGE_AND_DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/uImage/zImage/g"`
+
+		install -d ${DEPLOYDIR}
+		install -m 0644 ${B}/arch/${ARCH}/boot/zImage ${DEPLOYDIR}/${ZIMAGE_AND_DTB_NAME}
+		cd ${DEPLOYDIR}
+		ln -sf ${ZIMAGE_AND_DTB_NAME} zImage
+		cd -
+	fi
+
+	# zImage + DTB
+	if [ -f ${B}/arch/${ARCH}/boot/zImage+dtb ]; then
+		ZIMAGE_AND_DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/uImage/zImage+dtb/g"`
+
+		install -d ${DEPLOYDIR}
+		install -m 0644 ${B}/arch/${ARCH}/boot/zImage+dtb ${DEPLOYDIR}/${ZIMAGE_AND_DTB_NAME}
+		cd ${DEPLOYDIR}
+		ln -sf ${ZIMAGE_AND_DTB_NAME} zImage+dtb
+		cd -
+	else
+		echo "Warning: arch/${ARCH}/boot/zImage+dtb is not available!"
+        fi
+
+	# uImage (zImage + DTB)
+	if [ -f ${B}/arch/${ARCH}/boot/uImage+dtb ]; then
+		UIMAGE_AND_DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/uImage/uImage+dtb/g"`
+
+		install -d ${DEPLOYDIR}
+		install -m 0644 ${B}/arch/${ARCH}/boot/uImage+dtb ${DEPLOYDIR}/${UIMAGE_AND_DTB_NAME}
+		cd ${DEPLOYDIR}
+		ln -sf ${UIMAGE_AND_DTB_NAME} uImage+dtb
+		cd -
+	else
+		echo "Warning: arch/${ARCH}/boot/uImage+dtb is not available!"
+        fi
+}