From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7198826225008115712 X-Received: by 2002:a17:907:3e90:b0:931:51c0:7459 with SMTP id hs16-20020a1709073e9000b0093151c07459mr2175782ejc.4.1679059328299; Fri, 17 Mar 2023 06:22:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:8b06:b0:92b:b0f0:2860 with SMTP id sz6-20020a1709078b0600b0092bb0f02860ls3643232ejc.11.-pod-prod-gmail; Fri, 17 Mar 2023 06:22:06 -0700 (PDT) X-Google-Smtp-Source: AK7set+0tbtKH5eC02QU++M9couK6jYTW+sq9q9Pqgt2G5ooNpZS5QBn9mwTyHh3knB9YFNPgz6G X-Received: by 2002:a17:906:4354:b0:8ae:6b88:e52d with SMTP id z20-20020a170906435400b008ae6b88e52dmr3031495ejm.7.1679059326657; Fri, 17 Mar 2023 06:22:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679059326; cv=none; d=google.com; s=arc-20160816; b=c+3N263kg6LB1M0RmH853LuYWsOMwsSw9fHrhLJx3I2Ytv0ap164A97Gt0GgD7aOma v3YhQ8BmeVjQ7YgMGcJ96CgBIgW6hD1qcGbJnLyqYGzP9C/zENC/6gq6S+GBkyAQBA1M /rTXoyzk9BeEr7uKI0Yi37IocptOne2MglpfKzae5lzKIkHUkGW7/9Ft9qeXv6wehNiU 2CFkU+9BFeDk+fXRILXcU9RXKmgAmimy5yv3CU3L42YtSPOHpcvE898EM3kI3VKUiubi 8hnkbI/vQcE5suuu8jtA3f7wnVnfOgIfN5k56L694iZ/UTjvKZdP9VRsbCAzhwr+N/ep OO3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=hjAwwHZWWQ0RoAkewG1wRfdhAITKYhzAs3j6pQscsd0=; b=g9g4q3teeFU5s95uJtbO9N7xvjFLrSYuuhKvg0FHjmdrnegVYQA4QVY3AZajWtAKoV wL9qM7yhhVSUl0KDAzS07kdZ98f8GplADhsbhjxmqVySFKBMdWJGk2DwKAT+6ui6LEse pZEzhv0Bjl9UxFOdFdnPrRlQGVRDzz+tjA/zPav5iVo2RuwnA2eaMt8zwvITbpWBbGzE +bRYC4wWdtqbie+bJY6sHgkHn28HVcXjGJrrHTNCB/tz7psNTuRfFpi7Uv3ImAdXqWAl 8XcRWqPMfHsKw0K4nmLMU0LMmkWgj6Dv6DZd4KL9lqj2HUCuA91SHCaEFtpOVWcbJbKF I8VQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ULeGjvub; spf=pass (google.com: domain of fm-72506-20230317132206375fd42d5c47a50e17-oyrhng@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230317132206375fd42d5c47a50e17-oYRhNg@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id d16-20020a056402401000b0046c3ce626bdsi112833eda.2.2023.03.17.06.22.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2023 06:22:06 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230317132206375fd42d5c47a50e17-oyrhng@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ULeGjvub; spf=pass (google.com: domain of fm-72506-20230317132206375fd42d5c47a50e17-oyrhng@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230317132206375fd42d5c47a50e17-oYRhNg@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20230317132206375fd42d5c47a50e17 for ; Fri, 17 Mar 2023 14:22:06 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=hjAwwHZWWQ0RoAkewG1wRfdhAITKYhzAs3j6pQscsd0=; b=ULeGjvub3KEncGbQHw/2yWH34H9SWouY6I9A4QtdbPptmPLQhDdj6Ukz5StanixdL0y5rc SffJQRxgyrbYfqZDT9ScKv4X/3uj8Le4rt2PzKjnDepgiVnFjFhqsKPjy+pgfX5+YA9RtIOX UVlRQfmybBPvXzc4UC2O+EmNrTVjM=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, daniel.bovensiepen@siemens.com, florian.bezdeka@siemens.com, Felix Moessbauer Subject: [PATCH v3 7/7] starfive-visionfive2: add machine Date: Fri, 17 Mar 2023 14:21:06 +0100 Message-Id: <20230317132106.1111258-8-felix.moessbauer@siemens.com> In-Reply-To: <20230317132106.1111258-1-felix.moessbauer@siemens.com> References: <20230317132106.1111258-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: MJRMeQmoVGRS This patch adds the RISCV64 based StarFive VisionFive 2 machine. The target still needs a custom kernel and also only works from debian bookworm on. Signed-off-by: Felix Moessbauer --- meta-isar/conf/local.conf.sample | 1 + .../conf/machine/starfive-visionfive2.conf | 29 +++++++++++++++++++ .../starfive-visionfive2-sid-ports.conf | 7 +++++ .../canned-wks/starfive-visionfive2.wks.in | 23 +++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 meta-isar/conf/machine/starfive-visionfive2.conf create mode 100644 meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf create mode 100644 meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 7e0184e4..47f473a1 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -77,6 +77,7 @@ BBMULTICONFIG = " \ rpi-arm-v7l-bullseye \ rpi-arm64-v8-bullseye \ sifive-fu540-sid-ports \ + starfive-visionfive2-sid-ports \ qemuarm64-focal \ qemuamd64-focal \ " diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf new file mode 100644 index 00000000..a07b064f --- /dev/null +++ b/meta-isar/conf/machine/starfive-visionfive2.conf @@ -0,0 +1,29 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +DISTRO_ARCH = "riscv64" + +KERNEL_NAME ?= "starfive" + +PREFERRED_PROVIDER_u-boot-starfive-visionfive2 = "u-boot-starfive-visionfive2" + +IMAGE_FSTYPES ?= "wic" + +WKS_FILE ?= "starfive-visionfive2.wks.in" +IMAGER_INSTALL += " \ + jh7110-u-boot-spl-image \ + visionfive2-u-boot-firmware \ + ${SYSTEMD_BOOTLOADER_INSTALL}" +IMAGER_BUILD_DEPS += " \ + jh7110-u-boot-spl-image \ + visionfive2-u-boot-firmware" + +IMAGE_INSTALL += "sshd-regen-keys" +IMAGE_INSTALL += "expand-on-first-boot" + +# DTB file for OpenSBI +DTB_UBOOT_JH7110_VF2 = "starfive_visionfive2.dtb" +# DTB file for booting +DTB_FILES = "starfive/jh7110-visionfive-v2.dtb" diff --git a/meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf b/meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf new file mode 100644 index 00000000..98c9534a --- /dev/null +++ b/meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +MACHINE = "starfive-visionfive2" +DISTRO = "debian-sid-ports" 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 new file mode 100644 index 00000000..0f3d76a9 --- /dev/null +++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in @@ -0,0 +1,23 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +# The partition layout is based on the VisionFive2 example image: +# https://github.com/starfive-tech/VisionFive2/blob/JH7110_VisionFive2_devel/Makefile#L394 +# However, instead of booting via ubootenv + fit, we boot fit + efi +# +# When booting from the SD card, make sure that the DIP switches are set to SD card. +# By that, the board reads the u-boot firmware from the SD instead of the internal flash. +# This is required to boot efi with the correct device tree, which is included in the fit image. + +# SPL +part --source rawcopy --sourceparams "file=/usr/share/jh7110-uboot-spl-image/u-boot-spl.bin.normal.out" --ondisk mmcblk1 --fixed-size 2M --offset 2M --part-type 2E54B353-1271-4842-806F-E436D6AF6985 +# 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 +# rootfs +part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label image --active --align 1024 --exclude-path=boot/ + +bootloader --ptable gpt --timeout=0 --append "console=tty0 console=ttyS0,115200 earlycon rootwait" -- 2.30.2