From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: cip-dev@lists.cip-project.org
Cc: daniel.bovensiepen@siemens.com, jan.kiszka@siemens.com,
quirin.gylstorff@siemens.com,
Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [isar-cip-core][PATCH v4 7/8] add swupdate support for qemu-riscv64
Date: Fri, 3 Mar 2023 12:48:19 +0000 [thread overview]
Message-ID: <20230303124820.2209954-8-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20230303124820.2209954-1-felix.moessbauer@siemens.com>
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@siemens.com>
---
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
next prev parent reply other threads:[~2023-03-03 13:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 12:48 [isar-cip-core][PATCH v4 0/8] Add swupdate support for riscv64 Felix Moessbauer
2023-03-03 12:48 ` [isar-cip-core][PATCH v4 1/8] make reason for disabling wdog on arm more precise Felix Moessbauer
2023-03-03 12:48 ` [isar-cip-core][PATCH v4 2/8] fix efibootguard for riscv64 Felix Moessbauer
2023-03-03 12:48 ` [isar-cip-core][PATCH v4 3/8] wic(ebg): add support " Felix Moessbauer
2023-03-03 12:48 ` [isar-cip-core][PATCH v4 4/8] add opensbi with u-boot payload " Felix Moessbauer
2023-03-04 8:35 ` Jan Kiszka
2023-03-03 12:48 ` [isar-cip-core][PATCH v4 5/8] enhance qemu-riscv64 machine to be testable Felix Moessbauer
2023-03-03 12:48 ` [isar-cip-core][PATCH v4 6/8] add linux 6.1 mainline kernel Felix Moessbauer
2023-03-04 8:12 ` Jan Kiszka
2023-03-03 12:48 ` Felix Moessbauer [this message]
2023-03-03 12:48 ` [isar-cip-core][PATCH v4 8/8] start-qemu: add support for swupdate on RISC-V Felix Moessbauer
2023-03-06 6:10 ` [isar-cip-core][PATCH v4 0/8] Add swupdate support for riscv64 Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230303124820.2209954-8-felix.moessbauer@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=cip-dev@lists.cip-project.org \
--cc=daniel.bovensiepen@siemens.com \
--cc=jan.kiszka@siemens.com \
--cc=quirin.gylstorff@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).