From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7193944713273016320 X-Received: by 2002:a2e:6e0c:0:b0:27a:b66:aa7b with SMTP id j12-20020a2e6e0c000000b0027a0b66aa7bmr3576660ljc.246.1674970844483; Sat, 28 Jan 2023 21:40:44 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1146:b0:4cf:ff9f:bbfd with SMTP id m6-20020a056512114600b004cfff9fbbfdls57944lfg.1.-pod-prod-gmail; Sat, 28 Jan 2023 21:40:42 -0800 (PST) X-Google-Smtp-Source: AK7set8qG0tce+dJL7nANuvm9AyVBWzFQT73G3cjNAsU9a4DvcksOxhTU2651vBT1n8Cg4rUeLbp X-Received: by 2002:a05:6512:ac3:b0:4d6:d0a0:8313 with SMTP id n3-20020a0565120ac300b004d6d0a08313mr5994987lfu.10.1674970842684; Sat, 28 Jan 2023 21:40:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674970842; cv=none; d=google.com; s=arc-20160816; b=PGnIaoACYuIzeMNS5cszPNnRkPMfQn8Ix4Lj6IYV9UFbOwy/Q4X9QQqzFepE1BURMW NMc+XVXIwfL1gr/jjUvydL/4eca70rLmzNW7Dh7adKujqEMx/3OENJHQQ2lxMLJbPTaq cYIdp6MsHObY8T/1wNSsXcFvzovF0PRGTHixt+dEtnYaXNHOjxbOffclOwRaBJWSq58d yKCntdd9TbVU/bkvhoDO/v9UUERowwfcBMGU0nv3manuOBHocG5Os1pv0cp/NJ0gDfnr uASVioWnmOrfqesTGP44pjlliIM+rmJZczKRYSz5tpegEwJ32w8n8OM7fNYnVReMESrA 2Tuw== 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=+gi8053t1MNh4CaHjHURx7RLZiBgT1A5EGWgU6lSCPw=; b=n1DVx1xk1UK4BrzBZJbEu6VDkf892U7UUHzyu00ubQVM/fJALmb6eMle1LJg6SEorz 9LVlWza0kofnPnfFme+VGUpB2SptDYFaWMfkj6N6HZ52K0mET9ryGLSkF38cGV2c0Kte JGbqLU7ETDDzEiwxEWGzwEeMY+I8umahawTY+BL4j5Eu+Am7CWrV2o+XzLSHY/g5LtC1 n5AF2sS5KaIgFc/BUKVsKD7TkrLwCh6mlQC/VMxctnej3Iac1mrh6Ydr8oEnEEwP8YSD QgISa9ux23iG1z3xi9E2xtI2Jua+XMKH/w54194X9gW+Feh9tNWYu3D0+b9zY1VQEbd9 +QEw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="T/kYKZgd"; spf=pass (google.com: domain of fm-72506-202301290540415bffdaa0c1362f0ee9-wr8f2g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-202301290540415bffdaa0c1362f0ee9-wR8f2G@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id h6-20020ac25966000000b004d5786b729esi535259lfp.9.2023.01.28.21.40.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Jan 2023 21:40:42 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-202301290540415bffdaa0c1362f0ee9-wr8f2g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="T/kYKZgd"; spf=pass (google.com: domain of fm-72506-202301290540415bffdaa0c1362f0ee9-wr8f2g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-202301290540415bffdaa0c1362f0ee9-wR8f2G@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202301290540415bffdaa0c1362f0ee9 for ; Sun, 29 Jan 2023 06:40:41 +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=+gi8053t1MNh4CaHjHURx7RLZiBgT1A5EGWgU6lSCPw=; b=T/kYKZgd4HsA7xoqx4hUhrixxLO7LIZwPdpXUkJHO5J3Ue4SR37RvHmpiIqIxm9fHgF+Qb IgzFPzqS51n8+JyzqPu2Pu2kCRQB3QT7+Yg4VLYr5HhteFZzuSclP56xdvrpK56ThILBlMRi 1BOBnZ8Tjv35Egx5vrFjnmcNG6mxE=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: daniel.bovensiepen@siemens.com, jan.kiszka@siemens.com, florian.bezdeka@siemens.com, Felix Moessbauer Subject: [PATCH 7/7] starfive-visionfive2: add machine Date: Sun, 29 Jan 2023 05:38:56 +0000 Message-Id: <20230129053856.4014419-8-felix.moessbauer@siemens.com> In-Reply-To: <20230129053856.4014419-1-felix.moessbauer@siemens.com> References: <20230129053856.4014419-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: ehLJzsrPlKaI 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 f2275a8c..a2734cac 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