From e3e20300d40e0d3577d0d25af151c9d4b69cf44b Mon Sep 17 00:00:00 2001
From: Jeremy Grosser <jeremy@synack.me>
Date: Thu, 18 Oct 2018 13:35:23 +0000
Subject: lego-ev3: Add support for LEGO Mindstorms EV3 (AM1808)

Thanks for the feedback! Updated patch below. Changes:
 - Change SERIAL_CONSOLE to new SERIAL_CONSOLES format.
 - Move SPL_BINARY variable into lego-ev3 machine config
 - Check for KERNEL_DEVICETREE_BUNDLE before uImage manipulation.
 - Fix line wrapping errors introduced by MUA

Signed-off-by: Jeremy Grosser <jeremy@synack.me>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes-kernel/linux/bundle-devicetree.inc    | 26 ++++++++++++++++++++++++++
 recipes-kernel/linux/linux-ti-staging_4.14.bb |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 recipes-kernel/linux/bundle-devicetree.inc

(limited to 'recipes-kernel')

diff --git a/recipes-kernel/linux/bundle-devicetree.inc b/recipes-kernel/linux/bundle-devicetree.inc
new file mode 100644
index 00000000..4d450374
--- /dev/null
+++ b/recipes-kernel/linux/bundle-devicetree.inc
@@ -0,0 +1,26 @@
+# Upstream kernel-devicetree.bbclass only supports bundling the DTB with
+# zImage. The factory u-boot on lego-ev3 EEPROM only supports uImage, so we
+# append the DTB to the final uImage here.
+
+do_deploy_append() {
+    if [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
+        install -d ${DEPLOYDIR}
+        for dtbf in ${KERNEL_DEVICETREE}; do
+            dtb=`normalize_dtb "$dtbf"`
+            dtb_ext=${dtb##*.}
+            dtb_base_name=`basename $dtb .$dtb_ext`
+            for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
+                if [ "$type" = "uImage" ]; then
+                    cat ${D}/${KERNEL_IMAGEDEST}/$type \
+                    ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
+                    > ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
+                    ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
+                    ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+                    cat ${D}/${KERNEL_IMAGEDEST}/$type \
+                    ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
+                    > ${DEPLOYDIR}/$type
+                fi
+            done
+        done
+    fi
+}
diff --git a/recipes-kernel/linux/linux-ti-staging_4.14.bb b/recipes-kernel/linux/linux-ti-staging_4.14.bb
index 5ee206ec..13b94ffe 100644
--- a/recipes-kernel/linux/linux-ti-staging_4.14.bb
+++ b/recipes-kernel/linux/linux-ti-staging_4.14.bb
@@ -8,6 +8,7 @@ inherit kernel
 require recipes-kernel/linux/setup-defconfig.inc
 require recipes-kernel/linux/cmem.inc
 require recipes-kernel/linux/ti-uio.inc
+require recipes-kernel/linux/bundle-devicetree.inc
 
 # Look in the generic major.minor directory for files
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"
-- 
cgit v1.2.3-54-g00ecf