From 1a500ec5dad00ef13d3c4e2e6bfa35d403a9bf8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eil=C3=ADs=20N=C3=AD=20Fhlannag=C3=A1in?=
 <elizabeth.flanagan@huawei.com>
Date: Tue, 7 Dec 2021 12:34:10 +0000
Subject: [PATCH] nrf52.inc|stm32mp1-cortex-m4.inc: add needed MACHINEOVERRIDES
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

By removing the core bsps from meta-zephyr-bsp, we reintroduce build
issues caused by non-complete MACHINEOVERRIDES. This brings the needed
MACHINEOVERRIDES back into meta-zephyr.

Upstream-Status: Pending
Fixes oniro#190

Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
---
 conf/machine/include/nrf52.inc              | 7 +++++++
 conf/machine/include/stm32mp1-cortex-m4.inc | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/nrf52.inc b/conf/machine/include/nrf52.inc
index d22f8bc..a407da8 100644
--- a/conf/machine/include/nrf52.inc
+++ b/conf/machine/include/nrf52.inc
@@ -6,6 +6,13 @@
 require conf/machine/include/tune-cortexm4.inc
 
 MACHINEOVERRIDES =. "nordic:"
+MACHINEOVERRIDES =. "zmbedtls:"
+MACHINEOVERRIDES =. "zsof:"
+MACHINEOVERRIDES =. "ztracerecorder:"
+MACHINEOVERRIDES =. "ztfm:"
+MACHINEOVERRIDES =. "znanopb:"
+MACHINEOVERRIDES =. "ztensorflow:"
+MACHINEOVERRIDES =. "zsegger:"
 
 TUNE_FEATURES = "armv7m cortexm4"
 
diff --git a/conf/machine/include/stm32mp1-cortex-m4.inc b/conf/machine/include/stm32mp1-cortex-m4.inc
index b82b02d..5030767 100644
--- a/conf/machine/include/stm32mp1-cortex-m4.inc
+++ b/conf/machine/include/stm32mp1-cortex-m4.inc
@@ -6,6 +6,13 @@
 require conf/machine/include/tune-cortexm4.inc
 
 # Include OpenAMP for communication with Cortex-A7 core of the SoC
-MACHINEOVERRIDES =. "stm32:openamp:"
+MACHINEOVERRIDES =. "stm32:zopenamp:"
+MACHINEOVERRIDES =. "zmbedtls:"
+MACHINEOVERRIDES =. "zsof:"
+MACHINEOVERRIDES =. "ztracerecorder:"
+MACHINEOVERRIDES =. "ztfm:"
+MACHINEOVERRIDES =. "znanopb:"
+MACHINEOVERRIDES =. "ztensorflow:"
+MACHINEOVERRIDES =. "zsegger:"
 
 TUNE_FEATURES = "armv7m cortexm4"
-- 
GitLab