From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7220354510442463232 X-Received: by 2002:a17:906:7946:b0:931:fb3c:f895 with SMTP id l6-20020a170906794600b00931fb3cf895mr2608011ejo.4.1681119817821; Mon, 10 Apr 2023 02:43:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:784:b0:921:8068:e25e with SMTP id xd4-20020a170907078400b009218068e25els18035606ejb.0.-pod-prod-gmail; Mon, 10 Apr 2023 02:43:36 -0700 (PDT) X-Google-Smtp-Source: AKy350bQpHX+PfOmfGtQb7tiU7SdSjdszjyES7hawZkHJEhZA/0OF5IxeMDV6F/8RIcmHsgm/lPk X-Received: by 2002:a17:906:4812:b0:947:79b3:c2fa with SMTP id w18-20020a170906481200b0094779b3c2famr6848765ejq.17.1681119816155; Mon, 10 Apr 2023 02:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681119816; cv=none; d=google.com; s=arc-20160816; b=SgAW6GJBv9eHy/BnlECFhAx8TitlkZk45iAZxota6Kwf41EmlcCMHn46mSSdjgY5PP RdALj3cZT2JLiTtXag7KErMJq0uX7BestkEmndlURL1aE3y3koShQOyO2IUoUF4O1yHv jcYQrbGDwYcXrzFzSJEi2Dh43en8R3y9zd/fQCpwwU/roXDlObqj+kWJ8UOFa9xAQXDv rhdkYDXQb5CWhMlpYKhhh5SrMPtUmdEuw1xwkbKBVBIYdb3pPdgMsTM8MzK8hET14zDw amIbgEN0C7K++mhzGKgyKZgPy6sq1wTsghpTt6HHKpj1VRh75c1tZ21SGGDLu523/xvP AI/g== 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=vQJ12KR1I6GbAdwS920mb0pZ5SGvrLrRs72iupcVy9o=; b=dNPxHAYy/pqlbcD1jWM0nVIfq49it0wYyPaMnwj5U8iPX8C1MNzM5CzKEw68nSjMOY wd3jrpyUSIG61HJX9hZh0GT47FsK4wpdW7SdS4qRSEbLqoG+stN8mcHLq015PlTdDcdf m7u/cqHL5H/xSJpOI7Hvzdakfjg2RmAtB5ZB+qxBzu703g+wbT/P2nKEKV1H+iUHkd8b ySEwDlf/cLrTfOh/rtdv3mrxdGFrxMlrxo6tEuHJpS7eqRFa6EU7EDlyJA0ZCFijllPm 9Cgdwm4CjiBCOsbMhh7QiFbffvMqOD+Tp3f6bQAOQeGKFNmTC39ll55eXuClJgDVZbOA Mo9w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Fj+xSZUq; spf=pass (google.com: domain of fm-72506-202304100943350f8872f1aaead128f4-98kjdm@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-202304100943350f8872f1aaead128f4-98KjDM@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id ue10-20020a170907c68a00b008b14694acaesi455627ejc.2.2023.04.10.02.43.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2023 02:43:36 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202304100943350f8872f1aaead128f4-98kjdm@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Fj+xSZUq; spf=pass (google.com: domain of fm-72506-202304100943350f8872f1aaead128f4-98kjdm@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-202304100943350f8872f1aaead128f4-98KjDM@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202304100943350f8872f1aaead128f4 for ; Mon, 10 Apr 2023 11:43:35 +0200 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=vQJ12KR1I6GbAdwS920mb0pZ5SGvrLrRs72iupcVy9o=; b=Fj+xSZUqUq2chLiEX7txqlccEg3YT0X1xFSMeXdHdKA+xDjygNIm5DYjyQ4iN550cXZcf/ g7yLON/mNfHPh/GfJutH/bZXMt5D9ZMN6aSIT3Vj9elxdulNJxrfZY/kpq3xtQmEDEF/wQ1M JaRgef2DWsfnLcQ9RBXE65AZhjMvA=; 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 v4 6/6] starfive-visionfive2: add machine Date: Mon, 10 Apr 2023 09:42:52 +0000 Message-Id: <20230410094252.1151370-7-felix.moessbauer@siemens.com> In-Reply-To: <20230410094252.1151370-1-felix.moessbauer@siemens.com> References: <20230410094252.1151370-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: LM9kQtiD+xpU 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.34.1