From 87a1bc6c81f3cdabc1885f5585fd52cf929c939b Mon Sep 17 00:00:00 2001
From: Frieder Schrempf <frieder.schrempf@kontron.de>
Date: Tue, 20 Dec 2022 17:17:06 +0100
Subject: [PATCH] meta-ktn-imx: Add machine tune includes for older and newer
 releases

Weaken the include for the path in Dunfell releases and add another
reference to the path in Kirkstone so we can be compatible with both
releases.
---
 layers/meta-ktn-imx/conf/machine/include/ktn-mx6ul.inc | 3 ++-
 layers/meta-ktn-imx/conf/machine/include/ktn-mx8mm.inc | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/layers/meta-ktn-imx/conf/machine/include/ktn-mx6ul.inc b/layers/meta-ktn-imx/conf/machine/include/ktn-mx6ul.inc
index 7dc06c62..a8a3d1f4 100644
--- a/layers/meta-ktn-imx/conf/machine/include/ktn-mx6ul.inc
+++ b/layers/meta-ktn-imx/conf/machine/include/ktn-mx6ul.inc
@@ -1,4 +1,5 @@
-require conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINEOVERRIDES =. "mx6:mx6ul:ktn-mx6ul:"
 
diff --git a/layers/meta-ktn-imx/conf/machine/include/ktn-mx8mm.inc b/layers/meta-ktn-imx/conf/machine/include/ktn-mx8mm.inc
index 1703d881..b505bc45 100644
--- a/layers/meta-ktn-imx/conf/machine/include/ktn-mx8mm.inc
+++ b/layers/meta-ktn-imx/conf/machine/include/ktn-mx8mm.inc
@@ -1,4 +1,5 @@
-require conf/machine/include/tune-cortexa53.inc
+include conf/machine/include/tune-cortexa53.inc
+include conf/machine/include/arm/armv8a/tune-cortexa53.inc
 
 MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:ktn-mx8mm:"
 
-- 
GitLab