From patchwork Sun Jan 29 05:38:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2566 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sun, 29 Jan 2023 06:40:50 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 30T5enCr011321 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 29 Jan 2023 06:40:49 +0100 Received: by mail-lf1-f64.google.com with SMTP id l28-20020ac2555c000000b004cc8e53e69asf3952342lfk.18; Sat, 28 Jan 2023 21:40:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1674970844; cv=pass; d=google.com; s=arc-20160816; b=TwUrs0kohy1Ce23QgJ/PMypyJq+XGxka7mJE6JR3cV6N1qYpNX/8UE3d+W0/1u+nJN wV7m2YaSkQeZW+7k1UBcCPzO6MUWoZinYojgPE2WCq3ds7yVmhNu5tNpO7La9eI5m7Ie FokWwYZm7DTGmqjER1qZ3ZJzotgsmTyjJVVhd/JSwpvM+wkbtjOKZX5kho11NqQ023Me eLngpYA60oOd2BxV+wlvctDP6rSZj6VnD+M9mv7y+Dve6VNGC/KQzhdVl61GkzwtvFC9 WRN96mq6eDcjYl2H4fYd5jDFzU1cIs74foKlAMZctSNUqqro7mgD9bnML32I8I8lPsml TAuQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=tNkHz+wPoT3FbxS3dCWh5LRB/2/PkozTSejNs3jR6Bg=; b=nGH6Bhb2mna4zpV6dnZWkDCY/rgfNgihX+aAmJDbskccP9H1doE2oDKOCr1pwceZ53 UjgZliBu5lhmSoOo/3mdGVy4MhiUHF+r40mXszY6kZXWoS7/L5f6ZfRdyBAl4QZGRO3z kn1cHYYJ6WrI1f0IaW1wYEJCQ16sSDgKtCDYJKwngQAtTe2NdiXwDU4Y0l8O6yIeNBYT nmCYhFQUVL9rtYHjXCrZU2kV5BNpmFJ1SpFcczA168hVdcUbb7to3wOky9VeybAEihzN NEdQYA9DZ4xxHBAt26UznWWsQ21JlYUo6/lEvkZ6IbJE8cPwojwuZTEX/PFnWFMP5Cf9 CMHQ== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=tNkHz+wPoT3FbxS3dCWh5LRB/2/PkozTSejNs3jR6Bg=; b=oyGyLi2j6NOJzL//cgAAC7S8249QmPh4qcy48YHHkN/6X6cMMoWcaIL+ogpviop9C1 p5N/21AMoUoZ8cUh6cP5w9U9nF0wAQf8T4oRkQRfWJ7vqtHMQzBohV2J3rkdOzb3edap i/f0fe78Q4/MUwnr00qXJPcXYt+y6Ch//Q4z8O94gj/BScHUPSonU5ng9CLLAHJaKsF1 DcxliHnoKolqpgKj/2m5Rx8GBUrjzcx6B+jRbwbsssXW9CiBvueel7xBcg1gqTi3G6pz VbLR632N7g4wxAks/vAvQnQx34BP2+MVXnQmStaNadrAZEN+qMJZAVgN8NvDbROqAbrn wPdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=tNkHz+wPoT3FbxS3dCWh5LRB/2/PkozTSejNs3jR6Bg=; b=tNSysYZ5S8p1SF9W4KWS4jXMH0fJVVWjOTtXvloo/7ClDOADp0woOYKvLjv00Nruxq 9PWm9R3jFndXQQaHpQ7ej4D7zKGev2+MkxLSHNK+XnhY6cuvLz5B7e6YZsV7GkCWhCOc 8oyBFOnAFz+GuDWjJSRpJIR4TtMdN981G61SmhVixDNKe01sA8ETKGbkBtzxM7dl8Drn FV9ddgvabxOZaxe6vn6dw3CgNQh6FAgiYKI7v28n9n4fnO4GrrNaQllqymf5XbUrwSwe kFwVoJUa4ICPlvQb27CthQjvDVXKyAmEybfIv2G19hFTTgnDq0iAHDqKEQgajeLPQKdw C2vQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kpYXf6IRp8imG7UtlMwbPE21hsqzuRJYivss/s8YGQQW8LBaKXc DbZy7k1cTcfjJ7E/SWvGKqM= X-Google-Smtp-Source: AMrXdXt76NmoxiIcPe/m3JjRKGKul61Vtcf0VfkBacodgQF/Bh7ZX7S3fZBpcondhhsU+Ba+90bErw== X-Received: by 2002:a05:6512:a86:b0:4d5:77b2:1773 with SMTP id m6-20020a0565120a8600b004d577b21773mr3970300lfu.82.1674970844413; 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-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 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; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202301290540415bffdaa0c1362f0ee9 for ; Sun, 29 Jan 2023 06:40:41 +0100 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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"