From 757135658bc04d2d16f66bf7b7839f19e320f653 Mon Sep 17 00:00:00 2001
From: Natalia Kovalenko <waykovalenko@gmail.com>
Date: Mon, 7 Nov 2022 17:08:41 +0100
Subject: [PATCH] seco-px30-d23: Add RAUC/SYSOTA support configuration
manifests/default.xml: Update source revision on meta-seco-rockchip.
Update partition scheme in wic input file.
Add grub-efi support configuration.
sysota/sysota_git.bb: Add seco-px30-d23 model and bootloader type.
rauc/rauc-conf.inc Add RAUC_SLOT_A(B) device nodes and compatible
string for target.
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 63bc7267..eb8f6b05 100644
--- a/manifests/default.xml
+++ b/manifests/default.xml
@@ -40,7 +40,7 @@ SPDX-FileCopyrightText: Huawei Inc.
<project name="riscv/meta-riscv" remote="github" revision="70e099d7ceca52a1dde2c978713012f6b20a9891" path="meta-riscv" />
<project name="meta-arm" remote="yocto" revision="bafd1d013c2470bcec123ba4eb8232ab879b2660" path="meta-arm" />
<project name="jiazhang0/meta-secure-core" remote="github" revision="1a74be5b363ee61256093e0a3efaa78fd370a27c" path="meta-secure-core" />
- <project name="pub/rockchip/meta-seco-rockchip" remote="seco" revision="5cba7ff673fd81a2e640202d61b1c5cc7b10b161" path="meta-seco-rockchip" />
+ <project name="pub/rockchip/meta-seco-rockchip" remote="seco" revision="0b9259e8f9a217608939265a44714a1df053acff" path="meta-seco-rockchip" />
<project name="meta-virtualization" remote="yocto" revision="9a487c1851aa2021cf24f951957e22fd429c8025" path="meta-virtualization" />
<!--
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 1e13414f..f8664af5 100644
--- a/meta-oniro-core/recipes-core/bundles/oniro-bundle-base.bb
+++ b/meta-oniro-core/recipes-core/bundles/oniro-bundle-base.bb
@@ -10,6 +10,7 @@ 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:seco-px30-d23 := "SECO Juno"
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 5449f2fe..4de84f6d 100644
--- a/meta-oniro-core/recipes-core/rauc/rauc-conf.inc
+++ b/meta-oniro-core/recipes-core/rauc/rauc-conf.inc
@@ -21,6 +21,10 @@ 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:seco-px30-d23 := "SECO Juno"
+RAUC_SLOT_A:seco-px30-d23 := "/dev/mmcblk0p2"
+RAUC_SLOT_B:seco-px30-d23 := "/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 f90cf54c..35b20445 100644
--- a/meta-oniro-core/recipes-core/sysota/sysota_git.bb
+++ b/meta-oniro-core/recipes-core/sysota/sysota_git.bb
@@ -124,6 +124,9 @@ SYSOTA_BOOTLOADER_TYPE:seco-intel-b68 := "GRUB"
SYSOTA_MODEL:seco-imx8mm-c61 := "C61 / Astrid"
SYSOTA_BOOTLOADER_TYPE:seco-imx8mm-c61 := "GRUB"
+SYSOTA_MODEL:seco-px30-d23 := "D23 / Juno"
+SYSOTA_BOOTLOADER_TYPE:seco-px30-d23 := "GRUB"
+
do_install:prepend() {
sed \
-e 's,@SYSOTA_BOOTLOADER_TYPE@,${SYSOTA_BOOTLOADER_TYPE},g' \
--
GitLab