From 675863d9c051e1ae8d417902f95931ed2e283ec7 Mon Sep 17 00:00:00 2001
From: Natalia Kovalenko <waykovalenko@gmail.com>
Date: Wed, 19 Oct 2022 09:11:12 +0200
Subject: [PATCH] seco-imx8mm-c61: Add RAUC/SYSOTA support configuration.
manifests/default.xml: Update source revision on meta-seco-imx.
Add a new partition scheme in wic input file for seco-imx8mm-c61.
rauc/rauc-conf.inc: Add rauc slot A/B definitions.
sysota/sysota_git.bb: Add seco-imx8mm-c61 model and bootloader type.
bundles/oniro-bundle-base.bb Add target bundle compatibility string.
Signed-off-by: Natalia Kovalenko <waykovalenko@gmail.com>
---
manifests/default.xml | 2 +-
meta-oniro-core/recipes-core/bundles/oniro-bundle-base.bb | 1 +
meta-oniro-core/recipes-core/rauc/rauc-conf.inc | 4 ++++
meta-oniro-core/recipes-core/sysota/sysota_git.bb | 3 +++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/manifests/default.xml b/manifests/default.xml
index 22fbed56..49c1c049 100644
--- a/manifests/default.xml
+++ b/manifests/default.xml
@@ -33,7 +33,7 @@ SPDX-FileCopyrightText: Huawei Inc.
<project name="meta-intel" remote="yocto" revision="15cdda250fc5aa762ac0139087f96411ca696036" path="meta-intel" />
<project name="pub/intel/yocto/meta-seco-intel" remote="seco" revision="65a673560211b11986db5785c70254fad190785f" path="meta-seco-intel" />
<project name="meta-freescale" remote="yocto" revision="2e785f257ad98581b684f0e32f6d4bb96faefb10" path="meta-freescale" />
- <project name="pub/i.mx/yocto/5.x/meta-seco-imx" remote="seco" revision="604eea652c97a2b1aad94bf466ccb148e1c334a4" path="meta-seco-imx" />
+ <project name="pub/i.mx/yocto/5.x/meta-seco-imx" remote="seco" revision="f2cb750471dc263bc7c94ca6921cbaf25c37ccba" path="meta-seco-imx" />
<project name="meta-raspberrypi" remote="yocto" revision="0135a02ea577bd39dd552236ead2c5894d89da1d" path="meta-raspberrypi" />
<project name="meta-security" remote="yocto" revision="c79262a30bd385f5dbb009ef8704a1a01644528e" path="meta-security" />
<project name="rauc/meta-rauc" remote="github" revision="ea4236412dc4449eff4d52d3ef6b6d230355f936" path="meta-rauc" />
diff --git a/meta-oniro-core/recipes-core/bundles/oniro-bundle-base.bb b/meta-oniro-core/recipes-core/bundles/oniro-bundle-base.bb
index 858d15d0..1e13414f 100644
--- a/meta-oniro-core/recipes-core/bundles/oniro-bundle-base.bb
+++ b/meta-oniro-core/recipes-core/bundles/oniro-bundle-base.bb
@@ -9,6 +9,7 @@ SUMMARY = "SysOTA/RAUC Update Bundle for Oniro Base Image"
RAUC_BUNDLE_COMPATIBLE:raspberrypi-armv7 = "Raspberry Pi ARMv7"
RAUC_BUNDLE_COMPATIBLE:raspberrypi4-64 = "Raspberry Pi 4"
RAUC_BUNDLE_COMPATIBLE:seco-intel-b68 := "SECO Alvin"
+RAUC_BUNDLE_COMPATIBLE:seco-imx8mm-c61 := "SECO Astrid"
RAUC_BUNDLE_COMPATIBLE:qemux86 = "QEMU x86"
RAUC_BUNDLE_COMPATIBLE:qemux86-64 = "QEMU x86-64"
RAUC_BUNDLE_COMPATIBLE:qemuarm-efi = "QEMU ARM (EFI)"
diff --git a/meta-oniro-core/recipes-core/rauc/rauc-conf.inc b/meta-oniro-core/recipes-core/rauc/rauc-conf.inc
index 80cad39e..5449f2fe 100644
--- a/meta-oniro-core/recipes-core/rauc/rauc-conf.inc
+++ b/meta-oniro-core/recipes-core/rauc/rauc-conf.inc
@@ -17,6 +17,10 @@ RAUC_COMPAT:seco-intel-b68 := "SECO Alvin"
RAUC_SLOT_A:seco-intel-b68 := "/dev/sda2"
RAUC_SLOT_B:seco-intel-b68 := "/dev/sda3"
+RAUC_COMPAT:seco-imx8mm-c61 := "SECO Astrid"
+RAUC_SLOT_A:seco-imx8mm-c61 := "/dev/mmcblk0p2"
+RAUC_SLOT_B:seco-imx8mm-c61 := "/dev/mmcblk0p3"
+
RAUC_COMPAT:qemux86 := "QEMU x86"
RAUC_SLOT_A:qemux86 := "/dev/sda2"
RAUC_SLOT_B:qemux86 := "/dev/sda3"
diff --git a/meta-oniro-core/recipes-core/sysota/sysota_git.bb b/meta-oniro-core/recipes-core/sysota/sysota_git.bb
index 007bdcf2..f90cf54c 100644
--- a/meta-oniro-core/recipes-core/sysota/sysota_git.bb
+++ b/meta-oniro-core/recipes-core/sysota/sysota_git.bb
@@ -121,6 +121,9 @@ SYSOTA_BOOTLOADER_TYPE:qemuarm64-efi := "GRUB"
SYSOTA_MODEL:seco-intel-b68 := "B68 / Alvin"
SYSOTA_BOOTLOADER_TYPE:seco-intel-b68 := "GRUB"
+SYSOTA_MODEL:seco-imx8mm-c61 := "C61 / Astrid"
+SYSOTA_BOOTLOADER_TYPE:seco-imx8mm-c61 := "GRUB"
+
do_install:prepend() {
sed \
-e 's,@SYSOTA_BOOTLOADER_TYPE@,${SYSOTA_BOOTLOADER_TYPE},g' \
--
GitLab