From 04e2d880ada93f55077289bce70db0b70af87580 Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Tue, 21 Jun 2022 17:59:36 +0200
Subject: [PATCH] ccmp1: add CCMP1 include file to collect common configuration

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
(cherry picked from commit 84e544b27bbe234a03a783013a6a9063d1fe4b29)
---
 meta-digi-arm/conf/machine/ccmp15-dvk.conf   |  8 +++----
 meta-digi-arm/conf/machine/include/ccmp1.inc | 23 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 meta-digi-arm/conf/machine/include/ccmp1.inc

diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 0cfde3433..f637f677f 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -7,6 +7,9 @@ include conf/machine/include/st-machine-common-stm32mp.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 include conf/machine/include/digi-defaults.inc
 
+# Include the machine configuration for Digi's ConnectCore MP1.
+include conf/machine/include/ccmp1.inc
+
 # =========================================================================
 # Chip architecture
 # =========================================================================
@@ -127,8 +130,6 @@ UBOOT_ENV_SIZE ?= "0x20000"
 # available space in the environment partition)
 UBOOT_ENV_RANGE ?= ""
 
-STORAGE_MEDIA = "mtd"
-
 # mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files)
 # Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size.
 MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255"
@@ -137,9 +138,6 @@ MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255"
 # Max LEB count (-c 8191) calculated for a partition of up to 1 GiB considering 128 KiB erase-block size.
 MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191"
 
-# Enable STM specific features
-DEY_BUILD_PLATFORM = "STM"
-
 # Wireless external module
 HAS_WIFI_VIRTWLANS = "true"
 
diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
new file mode 100644
index 000000000..cf4866135
--- /dev/null
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: ConnectCore for STM32MP1.
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore MP1.
+
+# Platform u-boot settings
+UBOOT_PREFIX = "u-boot"
+UBOOT_SUFFIX = "bin"
+
+STORAGE_MEDIA = "mtd"
+
+# Enable STM specific features
+DEY_BUILD_PLATFORM = "STM"
+
+# SWUpdate sw-description configuration
+BOOTFS_EXT ?= ".boot.ubifs"
+ROOTFS_EXT ?= ".ubifs"
+
+BOOT_DEV_NAME ?= "linux"
+ROOTFS_DEV_NAME ?= "rootfs"
+ROOTFS_ENC_DEV = "${ROOTFS_DEV_NAME}"
+ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
+
+UBOOT_DEV_NAME ?= "/dev/mtd"