imx-oei: only pass a non-empty DDR_CONFIG to EXTRA_OEMAKE

Commit 6ff67d5c ("imx-oei.inc: Use PACKAGECONFIG support of ecc and tcm")
started always passing DDR_CONFIG to EXTRA_OEMAKE. Its value depends on
PACKAGECONFIG, either passing in OEI_DDRCONFIG_ECC or OEI_DDRCONFIG.

However, OEI_DDRCONFIG and/or OEI_DDRCONFIG_ECC are not necessarily
present. When they are not, an empty DDR_CONFIG is passed to make, which
prevents imx-oei from using its default value for this.

Make the passing of DDR_CONFIG conditional on the existence of
OEI_DDRCONFIG(_ECC) again.

Fixes: 6ff67d5c ("imx-oei.inc: Use PACKAGECONFIG support of ecc and tcm")
Signed-off-by: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
index a54105e57..d46080553 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
@@ -22,12 +22,20 @@ LDFLAGS[unexport] = "1"
 
 EXTRA_OEMAKE = "\
     board=${OEI_BOARD} \
-    DDR_CONFIG=${@bb.utils.contains('PACKAGECONFIG', 'ecc', '${OEI_DDRCONFIG_ECC}', '${OEI_DDRCONFIG}', d)} \
     DEBUG=${OEI_DEBUG} \
     OEI_CROSS_COMPILE=arm-none-eabi-"
 
 EXTRA_OEMAKE:append:mx95-generic-bsp = " r=${IMX_SOC_REV}"
 
+python () {
+    if 'ecc' in d.getVar('PACKAGECONFIG'):
+        ddr_conf = d.getVar('OEI_DDRCONFIG_ECC')
+    else:
+        ddr_conf = d.getVar('OEI_DDRCONFIG')
+    if ddr_conf:
+        d.appendVar('EXTRA_OEMAKE', ' DDR_CONFIG='+ddr_conf)
+}
+
 do_configure() {
     for oei_config in ${OEI_CONFIGS}; do
         oe_runmake clean oei=$oei_config