[isar-cip-core][PATCH v4 7/8] add swupdate support for qemu-riscv64


Felix Moessbauer <felix.moessbauer@...>
 

This patch enables the swupdate KConfig entry for the qemu-riscv64
board. For that, we also duplicate the qemu-arm64-efibootguard.wks
template for qemu-riscv64. As this is the first riscv64 board, we do not
symlink but create a copy.

Signed-off-by: Felix Moessbauer <felix.moessbauer@...>
---
Kconfig | 2 +-
kas/opt/ebg-swu.yml | 1 +
wic/qemu-riscv64-efibootguard.wks.in | 13 +++++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 wic/qemu-riscv64-efibootguard.wks.in

diff --git a/Kconfig b/Kconfig
index a932bbe..7d72094 100644
--- a/Kconfig
+++ b/Kconfig
@@ -181,7 +181,7 @@ if IMAGE_FLASH && !KERNEL_4_4 && !KERNEL_4_19

config IMAGE_SWUPDATE
bool "SWUpdate support for root partition"
- depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB
+ depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB || ( TARGET_QEMU_RISCV64 && KERNEL_6_1_MAINLINE )

config IMAGE_SECURE_BOOT
bool "Secure boot support"
diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml
index 6bc893b..203a6b9 100644
--- a/kas/opt/ebg-swu.yml
+++ b/kas/opt/ebg-swu.yml
@@ -32,3 +32,4 @@ local_conf_header:
# Add U-Boot for qemu
IMAGER_BUILD_DEPS:append:qemu-arm64 = " u-boot-qemu-arm64"
IMAGER_BUILD_DEPS:append:qemu-arm = " u-boot-qemu-arm"
+ IMAGER_BUILD_DEPS:append:qemu-riscv64 = " opensbi-qemu-riscv64"
diff --git a/wic/qemu-riscv64-efibootguard.wks.in b/wic/qemu-riscv64-efibootguard.wks.in
new file mode 100644
index 0000000..d63fc3a
--- /dev/null
+++ b/wic/qemu-riscv64-efibootguard.wks.in
@@ -0,0 +1,13 @@
+# short-description: riscv64 with EFI Boot Guard and SWUpdate
+# long-description: Disk image for riscv64 machines with EFI Boot Guard and SWUpdate
+
+include ebg-sysparts.inc
+
+part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}"
+part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}"
+
+# home and var are extra partitions
+part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G
+part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --fstype=ext4 --label var --align 1024 --size 2G
+
+bootloader --ptable gpt
--
2.34.1