From 873c56756524bf35016f0ad1b732baed49650414 Mon Sep 17 00:00:00 2001
From: Hiago De Franco <hiago.franco@toradex.com>
Date: Wed, 28 Aug 2024 09:33:03 -0300
Subject: imx-oei: move to dynamic-layers and add arm-toolchain

The recipe depends on meta-arm-toolchain, therefore it should be on
dynamic-layers/arm-toolchain folder. Create it and make the necessary
changes for conf/layer.conf.

Fixes: 61beaf5861f2 ("recipes-bsp: introduce imx-oei recipe")
Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
(cherry picked from commit 07931ef7fdf35ca2956481387f8476cd531a9048)
---
 conf/layer.conf                                    |  2 +
 .../recipes-bsp/imx-oei/imx-oei_1.0.0.bb           | 57 ++++++++++++++++++++++
 recipes-bsp/imx-oei/imx-oei_1.0.0.bb               | 57 ----------------------
 3 files changed, 59 insertions(+), 57 deletions(-)
 create mode 100644 dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
 delete mode 100644 recipes-bsp/imx-oei/imx-oei_1.0.0.bb

diff --git a/conf/layer.conf b/conf/layer.conf
index ef4e3e6e6..e49a9f6ac 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -52,6 +52,8 @@ BBFILES_DYNAMIC += " \
     \
     meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/*/*/*.bbappend \
     \
+    arm-toolchain:${LAYERDIR}/dynamic-layers/arm-toolchain/*/*/*.bb \
+    \
     multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bb \
     multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \
     \
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
new file mode 100644
index 000000000..a853a803a
--- /dev/null
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
@@ -0,0 +1,57 @@
+SUMMARY = "i.MX Optional Execution Image"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "gcc-arm-none-eabi-native"
+
+SRC_URI = "${IMX_OEI_SRC};branch=${SRCBRANCH}"
+IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https"
+SRCBRANCH = "master"
+SRCREV = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678"
+
+S = "${WORKDIR}/git"
+
+inherit deploy
+
+OEI_CONFIGS ?= "UNDEFINED"
+OEI_CORE    ?= "UNDEFINED"
+OEI_SOC     ?= "UNDEFINED"
+OEI_BOARD   ?= "UNDEFINED"
+
+LDFLAGS[unexport] = "1"
+
+EXTRA_OEMAKE = "\
+    board=${OEI_BOARD} \
+    DEBUG=1 \
+    OEI_CROSS_COMPILE=arm-none-eabi-"
+
+do_configure() {
+    for oei_config in ${OEI_CONFIGS}; do
+        oe_runmake clean oei=$oei_config
+    done
+}
+
+do_compile() {
+    for oei_config in ${OEI_CONFIGS}; do
+        oe_runmake oei=$oei_config
+    done
+}
+
+do_install() {
+    install -d ${D}/firmware
+    for oei_config in ${OEI_CONFIGS}; do
+        install -m 0644 ${B}/build/${OEI_BOARD}/$oei_config/oei-*.bin ${D}/firmware
+    done
+}
+
+addtask deploy after do_install
+do_deploy() {
+    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
+}
+
+FILES:${PN} = "/firmware"
+SYSROOT_DIRS += "/firmware"
+
+COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
diff --git a/recipes-bsp/imx-oei/imx-oei_1.0.0.bb b/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
deleted file mode 100644
index a853a803a..000000000
--- a/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-SUMMARY = "i.MX Optional Execution Image"
-
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "gcc-arm-none-eabi-native"
-
-SRC_URI = "${IMX_OEI_SRC};branch=${SRCBRANCH}"
-IMX_OEI_SRC ?= "git://github.com/nxp-imx/imx-oei.git;protocol=https"
-SRCBRANCH = "master"
-SRCREV = "1a572a640ef8d6883e8ca39744cd6d2d5dbed678"
-
-S = "${WORKDIR}/git"
-
-inherit deploy
-
-OEI_CONFIGS ?= "UNDEFINED"
-OEI_CORE    ?= "UNDEFINED"
-OEI_SOC     ?= "UNDEFINED"
-OEI_BOARD   ?= "UNDEFINED"
-
-LDFLAGS[unexport] = "1"
-
-EXTRA_OEMAKE = "\
-    board=${OEI_BOARD} \
-    DEBUG=1 \
-    OEI_CROSS_COMPILE=arm-none-eabi-"
-
-do_configure() {
-    for oei_config in ${OEI_CONFIGS}; do
-        oe_runmake clean oei=$oei_config
-    done
-}
-
-do_compile() {
-    for oei_config in ${OEI_CONFIGS}; do
-        oe_runmake oei=$oei_config
-    done
-}
-
-do_install() {
-    install -d ${D}/firmware
-    for oei_config in ${OEI_CONFIGS}; do
-        install -m 0644 ${B}/build/${OEI_BOARD}/$oei_config/oei-*.bin ${D}/firmware
-    done
-}
-
-addtask deploy after do_install
-do_deploy() {
-    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
-}
-
-FILES:${PN} = "/firmware"
-SYSROOT_DIRS += "/firmware"
-
-COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
-- 
cgit v1.2.3-54-g00ecf