nrf52.inc|stm32mp1-cortex-m4.inc: add needed MACHINEOVERRIDES

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

@@ -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"
 

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"