Merge pull request #2360 from hiagofranco/sync-imx-oei-master

[master] Cherry-pick commits from scarthgap on imx-oei

3 files changed, 14 insertions, 3 deletions

diff --git a/conf/machine/imx95-19x19-verdin.conf b/conf/machine/imx95-19x19-verdin.conf
index 38acc47da..5ae9ac665 100644
--- a/conf/machine/imx95-19x19-verdin.conf
+++ b/conf/machine/imx95-19x19-verdin.conf
@@ -8,6 +8,12 @@ MACHINEOVERRIDES =. "mx95:"
 
 require conf/machine/include/imx95-evk.inc
 
+# iMX95 Verdin EVK V1.1E is the first revision with a B0 SoC,
+# older versions require A0/A1 support, set with the below variable
+#IMX_SOC_REV:${MACHINE} = "A0"
+# When building for A0/A1 iMX95 SoCs, set OEI_DDRCONFIG accordingly
+OEI_DDRCONFIG = "${@'XIMX95LPD5EVK19_6400mbps_train_timing_a1' if d.getVar('IMX_SOC_REV')[0] == 'A' else ''}"
+
 KERNEL_DEVICETREE_BASENAME = "imx95-19x19-verdin"
 
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index f9151e4f9..50e89e9be 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -185,6 +185,7 @@ IMX_SOC_REV:mx8ulp-generic-bsp ??= \
     "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', 'A0', \
                                                            'A2', d)}"
 IMX_SOC_REV:mx93-generic-bsp   ??= "A1"
+IMX_SOC_REV:mx95-generic-bsp   ??= "B0"
 
 IMX_SOC_REV_LOWER   = "${@d.getVar('IMX_SOC_REV').lower()}"
 IMX_SOC_REV_UPPER   = "${@d.getVar('IMX_SOC_REV').upper()}"
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
index df704dc99..33ec90349 100644
--- 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
@@ -1,7 +1,7 @@
 SUMMARY = "i.MX Optional Execution Image"
 
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59530bdf33659b29e73d4adb9f9f6552"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b66f32a90f9577a5a3255c21d79bc619"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "gcc-arm-none-eabi-native"
@@ -9,7 +9,7 @@ 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"
+SRCREV = "ca91ce798b2f3a2a0bab8c0f835f4bea88c9b080"
 
 inherit deploy
 
@@ -19,6 +19,7 @@ OEI_CONFIGS ?= "UNDEFINED"
 OEI_CORE    ?= "UNDEFINED"
 OEI_SOC     ?= "UNDEFINED"
 OEI_BOARD   ?= "UNDEFINED"
+OEI_DDRCONFIG  ?= ""
 
 LDFLAGS[unexport] = "1"
 
@@ -27,6 +28,9 @@ EXTRA_OEMAKE = "\
     DEBUG=1 \
     OEI_CROSS_COMPILE=arm-none-eabi-"
 
+EXTRA_OEMAKE:append:mx95-generic-bsp = " r=${IMX_SOC_REV}"
+EXTRA_OEMAKE:append = " ${@' DDR_CONFIG=${OEI_DDRCONFIG}' if d.getVar('OEI_DDRCONFIG') else ''}"
+
 do_configure() {
     for oei_config in ${OEI_CONFIGS}; do
         oe_runmake clean oei=$oei_config