Merge pull request #1059 from MaxKrummenacher/master

simplify the use of imx-boot-containers

2 files changed, 2 insertions, 1 deletions

diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index a3496e8b..71c2809d 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -87,6 +87,7 @@ do_deploy:append() {
                     # artifacts handled by oe-core's u-boot.inc are
                     # treated.
                     ln -sf flash.bin-${MACHINE}-${type} flash.bin
+                    ln -sf flash.bin-${MACHINE}-${type} imx-boot
                 fi
             done
             unset  j
diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index dfd708e4..eb88fb99 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -25,7 +25,7 @@ SECO_FIRMWARE_NAME:mx8dx-nxp-bsp  = "mx8qxc0-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8dxl-nxp-bsp = "mx8dxla1-ahab-container.img"
 
 python () {
-    if "mx8m-nxp-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
+    if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
         return # We need to allow the recipes to be parsed for this case
 
     seco_firmware = d.getVar('SECO_FIRMWARE_NAME')