From 9a2eb7ea5f925901cd278d9d5142f8f70421780f Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Wed, 29 Jun 2022 12:49:11 +0200
Subject: [PATCH] linux-dey: add ConnectCore MP15 support to kernel v5.15

https://onedigi.atlassian.net/browse/DEL-7981

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
index d0bf4da06..fec9921b8 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
@@ -5,12 +5,18 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 # CONFIG_KERNEL_LZO in defconfig
-DEPENDS += "lzop-native"
+DEPENDS += "${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'NXP', 'lzop-native', '', d)}"
 
 inherit kernel
 inherit ${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'NXP', 'fsl-kernel-localversion', '', d)}
 
 SRCBRANCH = "v5.15.32/nxp/master"
+SRCBRANCH:stm32mpcommon = "v5.15.24/stm/master"
+
+require ${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)}
+# Don't create custom folder for kernel artifacts
+do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
+
 require recipes-kernel/linux/linux-dey-src.inc
 require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-virtualization.inc', '', d)}
 require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/linux-trustfence.inc', '', d)}
@@ -33,4 +39,6 @@ do_configure:append() {
 	fi
 }
 
-COMPATIBLE_MACHINE = "(ccimx6ul)"
+KERNEL_EXTRA_ARGS:stm32mpcommon += "LOADADDR=${ST_KERNEL_LOADADDR}"
+
+COMPATIBLE_MACHINE = "(ccimx6ul|ccmp15-dvk)"