From 0b85b2b1103733d974075229f4829de4ffca5b80 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Thu, 20 May 2021 18:07:20 +0200
Subject: image_type_tezi: handle emmc being mmcblk2

Note that we currently do not want to use the stable symlinks to the
eMMC for modules were older version of the Toradex Easy Installer exist.
Using the stable symlinks would require a Toradex Easy Instaler 5.3.0 or
newer.

For Verdin iMX8MP 5.3.0 is the first version and thus we can directly use
the stable symlink name pointing to the eMMC.

Related-to: TEI-750
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit fad3643e14fc4412288549b833b097ec4a44bf33)
---
 classes/image_type_tezi.bbclass | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'classes')

diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass
index 93911a8..ca73768 100644
--- a/classes/image_type_tezi.bbclass
+++ b/classes/image_type_tezi.bbclass
@@ -19,6 +19,10 @@ TDX_RELEASE ??= "0.0.0"
 TDX_MATRIX_BUILD_TIME ??= "${DATETIME}"
 TDX_MATRIX_BUILD_TIME[vardepsexclude] = "DATETIME"
 
+EMMCDEV = "mmcblk0"
+EMMCDEV_verdin-imx8mp = "emmc"
+EMMCDEVBOOT0 = "mmcblk0boot0"
+EMMCDEVBOOT0_verdin-imx8mp = "emmc-boot0"
 TEZI_VERSION ?= "${DISTRO_VERSION}"
 TEZI_DATE ?= "${TDX_MATRIX_BUILD_TIME}"
 TEZI_IMAGE_NAME ?= "${IMAGE_NAME}"
@@ -129,9 +133,11 @@ def tezi_deploy_files(d, deploy_var, deploy_dir, source_dir=None):
 
 def rootfs_tezi_emmc(d, use_bootfiles):
     from collections import OrderedDict
+    emmcdev = d.getVar('EMMCDEV')
+    emmcdevboot0 = d.getVar('EMMCDEVBOOT0')
+    imagename = d.getVar('IMAGE_LINK_NAME')
     offset_bootrom = d.getVar('OFFSET_BOOTROM_PAYLOAD')
     offset_spl = d.getVar('OFFSET_SPL_PAYLOAD')
-    imagename = d.getVar('IMAGE_LINK_NAME')
 
     bootpart_rawfiles = []
     filesystem_partitions = []
@@ -177,11 +183,11 @@ def rootfs_tezi_emmc(d, use_bootfiles):
 
     return [
         OrderedDict({
-          "name": "mmcblk0",
+          "name": emmcdev,
           "partitions": filesystem_partitions
         }),
         OrderedDict({
-          "name": "mmcblk0boot0",
+          "name": emmcdevboot0,
           "erase": True,
           "content": {
             "filesystem_type": "raw",
-- 
cgit v1.2.3