From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH 4/9] meta-isar: starfive-visionfive2: Use kernel DTB
Date: Tue, 2 Jan 2024 11:08:24 +0100 [thread overview]
Message-ID: <4361b1a7fe3fc9ad7fdeb3fab188ceb4d55fbc00.1704190109.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1704190109.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
This will be needed when switching to upstream U-Boot as the DTB there
is not compatible with currently used downstream kernel.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta-isar/conf/machine/starfive-visionfive2.conf | 3 ++-
.../scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf
index d96041fc..806d914c 100644
--- a/meta-isar/conf/machine/starfive-visionfive2.conf
+++ b/meta-isar/conf/machine/starfive-visionfive2.conf
@@ -21,4 +21,5 @@ IMAGER_BUILD_DEPS += " \
# DTB file for OpenSBI
DTB_UBOOT_JH7110_VF2 = "starfive_visionfive2.dtb"
# DTB file for booting
-DTB_FILES = "starfive/jh7110-visionfive-v2.dtb"
+DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb"
+DTB_FILES = "starfive/${DTB_VISIONFIVE2}"
diff --git a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in
index 0f3d76a9..99156f81 100644
--- a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in
+++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in
@@ -16,7 +16,7 @@ part --source rawcopy --sourceparams "file=/usr/share/jh7110-uboot-spl-image/u-b
# U-Boot FIT
part --source rawcopy --sourceparams "file=/usr/share/visionfive2-u-boot-firmware/visionfive2_fw_payload.img" --ondisk mmcblk1 --fixed-size 4M --offset 4M --part-type 5B193300-FC78-40CD-8002-E86C45580B47
# EFI
-part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --use-uuid --label efi --part-type EF00 --align 1024
+part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot,dtb=${DTB_VISIONFIVE2}" --use-uuid --label efi --part-type EF00 --align 1024
# rootfs
part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label image --active --align 1024 --exclude-path=boot/
--
2.35.3
next prev parent reply other threads:[~2024-01-02 10:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-02 10:08 [PATCH 0/9] Restore cross-build for RISC-V, update VisionFive 2 Jan Kiszka
2024-01-02 10:08 ` [PATCH 1/9] crossvars: Account for PACKAGE_ARCH = "${BUILD_ARCH}" Jan Kiszka
2024-01-02 10:08 ` [PATCH 2/9] Add workaround for cross-building riscv64 Jan Kiszka
2024-01-08 17:31 ` Jan Kiszka
2024-01-02 10:08 ` [PATCH 3/9] meta-isar: jh7110-u-boot-spl-tool: Use BPN instead of PN Jan Kiszka
2024-01-02 10:08 ` Jan Kiszka [this message]
2024-01-02 10:08 ` [PATCH 5/9] meta-isar: jh7110-u-boot-spl-tool: Rework Jan Kiszka
2024-01-02 10:08 ` [PATCH 6/9] meta-isar: starfive-visionfive2: Switch to upstream U-Boot Jan Kiszka
2024-01-02 10:08 ` [PATCH 7/9] meta-isar: starfive-visionfive2: Drop obsolete recipes Jan Kiszka
2024-01-02 10:08 ` [PATCH 8/9] meta-isar: linux-mainline: Update to 6.6.9 Jan Kiszka
2024-01-02 10:08 ` [PATCH 9/9] meta-isar: Switch VisionFive 2 to mainline kernel Jan Kiszka
2024-01-03 16:39 ` [PATCH 0/9] Restore cross-build for RISC-V, update VisionFive 2 Jan Kiszka
2024-01-05 15:45 ` Anton Mikanovich
2024-01-05 21:19 ` 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=4361b1a7fe3fc9ad7fdeb3fab188ceb4d55fbc00.1704190109.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=felix.moessbauer@siemens.com \
--cc=isar-users@googlegroups.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