From 51babaa55bad3c5ae0b98baa437c4f8f7bcd968b Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Mon, 7 Jun 2021 19:07:30 +0200
Subject: [PATCH] swu-images: create a common sw-description file.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
---
 .../swu-images/files/ccimx6ul/sw-description  | 20 -------
 .../swu-images/files/sw-description           | 56 +++++++++++++------
 2 files changed, 40 insertions(+), 36 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description

diff --git a/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description b/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description
deleted file mode 100644
index be20fab5f..000000000
--- a/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description
+++ /dev/null
@@ -1,20 +0,0 @@
-software =
-{
-    version = "##SW_VERSION##";
-    description = "##DESCRIPTION##";
-
-    images: (
-        {
-            filename = "##BOOTIMG_NAME##";
-            volume = "##BOOT_DEV##";
-            type = "ubivol";
-            sha256 = "@##BOOTIMG_NAME##";
-        },
-        {
-            filename = "##ROOTIMG_NAME##";
-            volume = "##ROOTFS_DEV##";
-            type = "ubivol";
-            sha256 = "@##ROOTIMG_NAME##";
-        }
-    );
-}
diff --git a/meta-digi-dey/recipes-digi/swu-images/files/sw-description b/meta-digi-dey/recipes-digi/swu-images/files/sw-description
index e2b1e365b..727581d36 100644
--- a/meta-digi-dey/recipes-digi/swu-images/files/sw-description
+++ b/meta-digi-dey/recipes-digi/swu-images/files/sw-description
@@ -3,21 +3,45 @@ software =
     version = "##SW_VERSION##";
     description = "##DESCRIPTION##";
 
-    images: (
-        {
-            filename = "##BOOTIMG_NAME##";
-            device = "##BOOT_DEV##";
-            type = "raw";
-            sha256 = "@##BOOTIMG_NAME##";
-            installed-directly = true;
-        },
-        {
-            filename = "##ROOTIMG_NAME##";
-            device = "##ROOTFS_DEV##";
-            type = "raw";
-            sha256 = "@##ROOTIMG_NAME##";
-            installed-directly = true;
+    mmc = {
+        platform: {
+            images: (
+                {
+                    filename = "##BOOTIMG_NAME##";
+                    device = "##BOOT_DEV##";
+                    type = "raw";
+                    sha256 = "@##BOOTIMG_NAME##";
+                    installed-directly = true;
+                },
+                {
+                    filename = "##ROOTIMG_NAME##";
+                    device = "##ROOTFS_DEV##";
+                    type ="raw";
+                    sha256 = "@##ROOTIMG_NAME##";
+                    installed-directly = true;
+                }
+            );
         }
-    );
-    ##PREINSTALL_SCRIPT##
+        ##PREINSTALL_SCRIPT##
+    };
+    mtd = {
+        platform: {
+            images: (
+                {
+                    filename = "##BOOTIMG_NAME##";
+                    volume = "##BOOT_DEV##";
+                    type = "ubivol";
+                    sha256 = "@##BOOTIMG_NAME##";
+                    installed-directly = true;
+                },
+                {
+                    filename = "##ROOTIMG_NAME##";
+                    volume = "##ROOTFS_DEV##";
+                    type ="ubivol";
+                    sha256 = "@##ROOTIMG_NAME##";
+                    installed-directly = true;
+                }
+            );
+        };
+    };
 }