From patchwork Fri Mar 17 13:21:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2731 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Mar 2023 14:21:34 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 32HDLXi1005479 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Mar 2023 14:21:33 +0100 Received: by mail-wm1-f63.google.com with SMTP id n38-20020a05600c3ba600b003ed29a0b729sf2253950wms.9; Fri, 17 Mar 2023 06:21:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1679059288; cv=pass; d=google.com; s=arc-20160816; b=TxEQaR5eL/U5oDSTeKsRBlsN6ksYkvbbHWKjqA4n2M3w1p+zFqwosg+afAtID4+hBS FtXHgvQmlHBI2Aj9GmVbEMQAwCAfLrj/GA2rczuWvoYU7gLjtmVfnEmQT/5YUUo3DAAo T/h0ovbklLXgrQJc6l1AcJWpbPYv3JJ58sA9tkYM/j9csW8yo5deVGXFzI9ZQgdmS0UP DdwSyHMcr/JKAxzL04dxLAT/9TZzLOLfPIku64tICm5WqMRzW/BHp7/jPP2MVvHIUjAB zf0rZgu59fLhs3zX7lr0BJAsxPA6yqdMhx6spsNwHoZDuGGGcv7UpPaYu/6KphkLJtXJ 71jg== 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=AjE9r/N8g97/46OYQDSTmvWC0ehUTP5fRK97aJHrsEE=; b=k7GK7ghgO2APtz8YOnkJOxKGZevHixRcS4Po7Ea4EaROlvaBSCyQcJ5wVER2B97sUX lk9CQ7U4NiCHsBO0jW/kpa19UZsbNnurOlCse1PwlSUP6taO9JQckIL7ytyEGuTOQOf6 k3CcAQzxNCkHWi+YtgqwKNQFZJCycUgS1NH06CDgLAWwSN76AYBrGKPl+vV4kFDqd+9C iNkml5tbDeG/rgkIAMDdhD7q1C+SE0mMdzVNRWF64Q5BjuQ2Prg2NKLFqJe+I0Tm69ff +5Wwvy3SxKAO8k2r/nc7HUCdusrS3g57dYM+PQl+ZAyzNDKJKNZbvAjRxLazD2IKope5 8lYg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jy8LVhHD; spf=pass (google.com: domain of fm-72506-20230317132125a9a09d653698210d7f-dngnxz@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230317132125a9a09d653698210d7f-dngnXz@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; t=1679059288; 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=AjE9r/N8g97/46OYQDSTmvWC0ehUTP5fRK97aJHrsEE=; b=NIAEgs2w/DMulghnk8Z4yzSzzHQIV+brxKNhvmryLCIROaZVEp3vQ+J3Z/P8ae3LyA s6a3QYVcxa4yp4+ABfL41r/o4JfkSj135aHMUDAPGjJxi1vZdlYt5O6+RuamB9L3l+w6 XZm9fdDNvBitBs7z07k8RwOGrqnKDLvBprtPJyl2O6WqM5AoTjqkoUtZtJSmzlRTkD6U cw3guxRQnAObvnkLautaQ7/croUY/DVRCw2r0QYRYqa3Gpd7LNhLLuxabe9ZKCz6ba2C mkOCGcEZ9WYsCYG+5Xc6ary4J34gl81IWxpgRHdXq7CMeJLSl+nL4OFEcQQXMOBofEp4 D7Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679059288; 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=AjE9r/N8g97/46OYQDSTmvWC0ehUTP5fRK97aJHrsEE=; b=gKKSq5sSKlWxov7iSmL7GehAkLl8jq8YeXwUkPSxNJfaBASXssjM9iJHKHJVxEM7oi qQvkXoCsnoA9nYTk9hTlJDrG1D2XYcnReK9cbv8i2LBkdcf2mws2wQq5l1P81X6pkbG0 ksWhcW3YmPQ620SsVBw5IJxTTRKVeej85QtV688qZiWbhtoo6tW5LsFN3A9W/lbOi6by ixbXMrVCDG3qzEoBeB/QxiJ8XFhJsaFj60Q7sQoXZJJuZgzz8DhcKAAfjBXrkrVM/MjM A4t3hYJTTodAzs78z7NhjiPlp+xeeueCZ5WuG5MbO0sZ7HAKTDCBkUAs5Bbdgy0OlDmC 1jLg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKVx4BIsQCzHGF6DKaWSZf2Y6nNGAU3bHy6hv9hfckGBSNVrwQBG twjl5/nPKhD67I4GWWTXlVA= X-Google-Smtp-Source: AK7set+qHLHNOqLvsI9qUBydBLIABcQRpBHyqlG/lFa59chs11a7hi5MtmYNQqX8UjfjCdgZMir39w== X-Received: by 2002:a05:600c:3d8b:b0:3e2:1a3f:4e9e with SMTP id bi11-20020a05600c3d8b00b003e21a3f4e9emr7017006wmb.3.1679059288124; Fri, 17 Mar 2023 06:21:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c1e:b0:3ed:7a82:9533 with SMTP id j30-20020a05600c1c1e00b003ed7a829533ls1322561wms.1.-pod-control-gmail; Fri, 17 Mar 2023 06:21:26 -0700 (PDT) X-Received: by 2002:a05:600c:4fc8:b0:3ed:1f98:670f with SMTP id o8-20020a05600c4fc800b003ed1f98670fmr1989699wmq.20.1679059286601; Fri, 17 Mar 2023 06:21:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679059286; cv=none; d=google.com; s=arc-20160816; b=DM4MnFHMoiyTYPpGXECFvhcIH+XEdbNb7r/kKn9LU5KbGtMY4R87nRV3p1G0UfgJs7 vqZp0Q83X2T1zUI6qMN8q7NrqXCRlxGRLxbzS27kg6F8GsuIgItudVwRqE4LST2+5hLw pdKy2eCCJqvC3uPFJR9XojN7hXlSWjP+s44SmW5LJuTF53ovC7tdY2c8iSvuAd9M1Ii0 h3TlweWE8Hd2WBzX7pB6kUnJVUdMo+7u7XZd4/LjOTrKnWAryQCO6ndjkKC6XuYnlLiQ C+E3WlS2wljiwOzpgsK5IRIM5HPrS96cECOg1bYfqeh0PO7YR4x19W7v93lc5upK7Krr 3FlA== 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=BCcSeXTtxQLo/6mGg9X7kM7PbH2dOG0QOdg423rxHZY=; b=GtLHPRKpdiyKWT37/K9wbdv62QOlJGkB9dmz70bllaaGa3wngZIOlOmGgtQhiS6Wzj HHqzJ5saP73EM8vCBKAYErNf2JIg7TEBsHrU69gA/TCixkuSJ8UJVmuLZ91wMkmGKWZs 9FoB91FiXlk3BXo1VfPArjXSyBWHxLph/DRvhSquknEOc1V5sdenLA/cjF74iSwDiAf3 YK/qr8hO/hR2rUp6IM5VsLc2wKZ3hY8wbQDKezrv2nkIl+wOdzTpHiT4x46DZoUEiPxC nZLPyZaQKXBVlV3Ina9XRzz98hT4cUVvFxwqCKiGHZS5BNrTBVkyKL2MFhglQ3iFXDbL ku7A== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jy8LVhHD; spf=pass (google.com: domain of fm-72506-20230317132125a9a09d653698210d7f-dngnxz@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230317132125a9a09d653698210d7f-dngnXz@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 o2-20020a05600c4fc200b003eaedc7aa48si390791wmq.0.2023.03.17.06.21.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2023 06:21:26 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230317132125a9a09d653698210d7f-dngnxz@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 20230317132125a9a09d653698210d7f for ; Fri, 17 Mar 2023 14:21:26 +0100 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 1/7] u-boot: make KCFLAGS and HOSTCFLAGS configurable Date: Fri, 17 Mar 2023 14:21:00 +0100 Message-Id: <20230317132106.1111258-2-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 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=jy8LVhHD; spf=pass (google.com: domain of fm-72506-20230317132125a9a09d653698210d7f-dngnxz@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-72506-20230317132125a9a09d653698210d7f-dngnXz@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?= For more complex u-boot configurations, custom compiler flags are required to e.g. inject more include paths or set the bits per long. This patch adds the bitbake variables KCFLAGS and HOSTCFLAGS which are forwarded and exported in the rules file. Signed-off-by: Felix Moessbauer --- meta/recipes-bsp/u-boot/files/debian/rules.tmpl | 5 ++++- meta/recipes-bsp/u-boot/u-boot-custom.inc | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/u-boot/files/debian/rules.tmpl b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl index 806b01fe..a29ec9b1 100755 --- a/meta/recipes-bsp/u-boot/files/debian/rules.tmpl +++ b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl @@ -3,7 +3,7 @@ # Debian rules for custom U-Boot build # # This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018-2021 +# Copyright (c) Siemens AG, 2018-2023 # # SPDX-License-Identifier: MIT @@ -12,6 +12,9 @@ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- SET_CROSS_BUILD_TOOLS=CROSS_BUILD_TOOLS=y endif +export KCFLAGS=${KCFLAGS} +export HOSTCFLAGS=${HOSTCFLAGS} + override_dh_auto_build: $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_CONFIG} $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_BIN} diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 876eb361..1e9744b1 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -26,8 +26,11 @@ python() { DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" +KCFLAGS ?= "" +HOSTCFLAGS ?= "" + TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" -TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS U_BOOT_CONFIG U_BOOT_BIN" +TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS U_BOOT_CONFIG U_BOOT_BIN KCFLAGS HOSTCFLAGS" U_BOOT_TOOLS_PACKAGE ?= "0" U_BOOT_CONFIG_PACKAGE ?= "0" From patchwork Fri Mar 17 13:21:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2732 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Mar 2023 14:21:40 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f57.google.com (mail-lf1-f57.google.com [209.85.167.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 32HDLYvo005485 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Mar 2023 14:21:40 +0100 Received: by mail-lf1-f57.google.com with SMTP id c29-20020a056512239d00b004e83ed6bbc5sf2024753lfv.23; Fri, 17 Mar 2023 06:21:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1679059289; cv=pass; d=google.com; s=arc-20160816; b=v6qZ92hG0NxXhi5Wv2K8UM6a9iMOmrauhr8j9M5OTjdRf0omOBR0IO9cyoDkHOhKTh ZVqcKoe+7MhFx/7afgeTk7XtqnTDi3WroPlXn0T7JZV4noDhD9SvAQfVRh9qk9aINnoy 61OIgf18PK2lNb2NG9KhtAynPwdsekC5WXBCKjO6Gt8z/nmIEpnFU2doLvuGcs+h/vvn UmndsajVS/tzXbEGN5dBT2SB1KA8R3mTkR++7V/yj/W8KTd4X88C5Oo+l5eUkfu1/nCl OMM+AWOE3mMBSF7ZCMR9A2EJSa+vUviCBxOlDup+044jhYIjMjEJ8o2hpPnfDzpL7DEp NKCQ== 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=8bKac7RdGsAN1XDF1HaQomP4bAUiCbwAxg6wmRQiClM=; b=VD1f3DisNtTRtUh+2F1mz/f6UcGF0ezvZ9O1ieP3yOxDsOf996PO2860PuDXl+eUF9 NC/rrvk5LBwPaO3JNJWWXESu3AOThAnX4its5KwqyEYJkQ5hr5Op9OAtMnW3+YL+IwGb qMcioA51GD2Gl1G/INLELIdwGPH5g6FkDVu2tAlaCwUAfM/79jX2ySwxutqVpQXHsKNa ADiFaRTyx8D3OqGYYL+JQ2kodRQZBEMEVnq1tGQyouQ7mtxokjrIo2+mLBVPlx1f4kNy fl1AQ8X/E06TVnI7gO5dm1gT7gUKT+Xxl+y2phhTMIkRIV4Y+rRBXlboFVBmZqMyuCQd BxQw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=i84rOGiZ; spf=pass (google.com: domain of fm-72506-20230317132127c0b91d2cef81160a97-_w7sfb@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-20230317132127c0b91d2cef81160a97-_w7Sfb@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; t=1679059289; 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=8bKac7RdGsAN1XDF1HaQomP4bAUiCbwAxg6wmRQiClM=; b=V6ciAnYsdtvWRHM45M5Jl1kAPoYh+gXQceEtljClECUcyXjMUIRv4YkJws7SEh29/p RFhXrkQCUTQ/yfFnuJhFxE5t9n3N6kBhEBowUznqAAHrEEXDbv3XeZOI70kN1/rKLbkx 3TLFECH4XqcHA5Kvohv2v2Jwzx/y0aGnBTAh31Xc0CZ1N5d2HuONq/4FOLcoFFzcbsSH VCW4h1e2QHH85HkqJ3kFrSG2lf4eIcBl0HVZLmyJJUG+v8DHmOMDTdGg3ZJgfRgxqZ29 lIEodYVE2cBiF2YczEizshKaLkOtAM1dJCQy8wyckNxXS5DCGJz6axbh0rxIWoXrffjr 6o1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679059289; 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=8bKac7RdGsAN1XDF1HaQomP4bAUiCbwAxg6wmRQiClM=; b=RpJatGD2J/R4e7l9T6UHQP7Y+VCHnw0AXbiqruAbUN29KssGKp2UvaiiTbrrXMpIz8 L+VqBvSjm6RdRa7RiJ8FvqzCmkWb1LUiBUqo1aT75lhd1/e+GlCkZ4jH6XSViSYTQkg7 vfoTBujr+WRFFKXU/q2PzVPK91uYlnrmm/3AkSPt8KjtLMaYrCXSQUsgpHWKmo21Y4mz t7exLWHXJEEJ2EEupodfB4UsWGAgz65Z2odPH2uorYXTkMqu7mx7+DI+5vcPiFcPKxab DKnExesucAZVcmmW50YR5H7/mZdBZBr6qH95QjJka4h7XJzTetK6Ev4oDwxVFZyFO+L4 I/tA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKUEsaczs2jEl14LYOgvX7DibxGBT+BdJjky7ZKmQiZYblmMYkDC QhSgPw9zSgpv9vpWBbiubmk= X-Google-Smtp-Source: AK7set88o2HL2v1GRmqjkP+h5sBfS4zmXHDTlxFWckMvc1ztfbAgIt3c3InHDX0xBkR+QrAcUwH7iA== X-Received: by 2002:a19:ae18:0:b0:4e8:6101:bcef with SMTP id f24-20020a19ae18000000b004e86101bcefmr2802427lfc.1.1679059289363; Fri, 17 Mar 2023 06:21:29 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a4af:0:b0:294:721f:ec38 with SMTP id g15-20020a2ea4af000000b00294721fec38ls1020038ljm.7.-pod-prod-gmail; Fri, 17 Mar 2023 06:21:27 -0700 (PDT) X-Received: by 2002:a2e:be92:0:b0:28e:a8aa:6f95 with SMTP id a18-20020a2ebe92000000b0028ea8aa6f95mr4180715ljr.8.1679059287512; Fri, 17 Mar 2023 06:21:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679059287; cv=none; d=google.com; s=arc-20160816; b=ptQDoOD8/SvDccNaUzHkD6TE/eJBl+VbY5+w9pXO7LYYQNVAekKOtu9ht0aK8SaN2O rs4eTMkx/hqp90XRGSD+kXaUN0zgTUN4LncrnvYjXj5Eogq8uvz5uzBIl+1VP2S4wU0d iAcy4t+oe6sgAdOrWsBMu9L2IuNHO1VqZC4bqfL0wdXs3GFNLt2i6RfwXJvzYVujPUNh 6dBKXBFQyNLK1E7Rilz/AcViyHjB/nssrb1EiOEyjY+VH0vNKzZAwEf6aMbld2UBzXXZ BTcWu8j5nAj//vy/JoEnZ+IpZFth1wNMEawD1PPJj6VAEz7OASrM3FygacKFWMtp8b9I Sp0Q== 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=lyVENv3PQYEqxGhxxNz5HXYSS5G2aw4V5tChbwfmA2Y=; b=PiewSgNpTuoFstQUOmzjjmMaZJmTNYIei6hMPlc7CM+Os5RMfn0DQFenqjS777aPB4 CSqrSBqu3kPSniO7jSK32+LtDBwqHryN0thySMmxCSOT7pfJVWM7Rhd/wJv/spEdvwXI DTyq5WFMocsn0PIkqo43mz8+bXNF9lnccFrwVzWmXf1YPX+Fhbr4PsoczYZWRdWYfBXA hbUzxUNnY31SW5+mlOcK5s5tJisXVh31Ou16ZuJUoFz05Fwxf9eD7AWOvfk0vXm0ALoy O+UH02+9jlJKYA2bucke8XgGSWXl5pqYVow4AKeLQ6slAuO1/dKmBG79oRobKsJAFnyO EVpg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=i84rOGiZ; spf=pass (google.com: domain of fm-72506-20230317132127c0b91d2cef81160a97-_w7sfb@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-20230317132127c0b91d2cef81160a97-_w7Sfb@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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 5-20020a05651c12c500b002959f20a2afsi99142lje.8.2023.03.17.06.21.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2023 06:21:27 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230317132127c0b91d2cef81160a97-_w7sfb@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20230317132127c0b91d2cef81160a97 for ; Fri, 17 Mar 2023 14:21:27 +0100 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 2/7] starfive-visionfive2: package u-boot Date: Fri, 17 Mar 2023 14:21:01 +0100 Message-Id: <20230317132106.1111258-3-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 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=i84rOGiZ; spf=pass (google.com: domain of fm-72506-20230317132127c0b91d2cef81160a97-_w7sfb@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-20230317132127c0b91d2cef81160a97-_w7Sfb@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 u-boot firmware for the starfive visionfive2 board. As the image is signed at build time, but verified at runtime, we get a rather complex cross dependency chain around openssl. To not diverge from the official visionfive2 BSP example, we keep the image signing. Signed-off-by: Felix Moessbauer --- ...x-offset-of-env-data-block-on-jh7110.patch | 30 +++++++ ...iscv-Fix-build-against-binutils-2.38.patch | 55 ++++++++++++ ...-opensbi-memory-range-in-device-tree.patch | 40 +++++++++ ...upport-building-double-float-modules.patch | 89 +++++++++++++++++++ ...five-visionfive2_2022.01-rc4+VF2-v2.8.0.bb | 44 +++++++++ 5 files changed, 258 insertions(+) create mode 100644 meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0001-fix-offset-of-env-data-block-on-jh7110.patch create mode 100644 meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0001-riscv-Fix-build-against-binutils-2.38.patch create mode 100644 meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0002-exclude-opensbi-memory-range-in-device-tree.patch create mode 100644 meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0002-riscv-support-building-double-float-modules.patch create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-v2.8.0.bb diff --git a/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0001-fix-offset-of-env-data-block-on-jh7110.patch b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0001-fix-offset-of-env-data-block-on-jh7110.patch new file mode 100644 index 00000000..bc373ff6 --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0001-fix-offset-of-env-data-block-on-jh7110.patch @@ -0,0 +1,30 @@ +From 3849b7fa6b35a5a1729c9d605d448d97862bcb5d Mon Sep 17 00:00:00 2001 +From: Felix Moessbauer +Date: Fri, 27 Jan 2023 12:36:13 +0800 +Subject: [PATCH 1/2] fix offset of env data block on jh7110 + +Xref: https://github.com/starfive-tech/u-boot/issues/39 + +Signed-off-by: Felix Moessbauer +--- + configs/starfive_visionfive2_defconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig +index 45c1767d34..032d208e77 100644 +--- a/configs/starfive_visionfive2_defconfig ++++ b/configs/starfive_visionfive2_defconfig +@@ -1,8 +1,8 @@ + CONFIG_RISCV=y + CONFIG_SYS_MALLOC_F_LEN=0x10000 + CONFIG_NR_DRAM_BANKS=1 +-CONFIG_ENV_SIZE=0x10000 +-CONFIG_ENV_OFFSET=0xF0000 ++CONFIG_ENV_SIZE=0x100000 ++CONFIG_ENV_OFFSET=0xF00000 + CONFIG_SPL_DM_SPI=y + CONFIG_DEFAULT_DEVICE_TREE="starfive_visionfive2" + CONFIG_SPL_MMC_SUPPORT=y +-- +2.30.2 + diff --git a/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0001-riscv-Fix-build-against-binutils-2.38.patch b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0001-riscv-Fix-build-against-binutils-2.38.patch new file mode 100644 index 00000000..6f8a2ae0 --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0001-riscv-Fix-build-against-binutils-2.38.patch @@ -0,0 +1,55 @@ +From 5df4b2299f86933fa79aa3bc6a3986fc7e55b7e0 Mon Sep 17 00:00:00 2001 +From: Alexandre Ghiti +Date: Mon, 3 Oct 2022 18:07:54 +0200 +Subject: [PATCH 1/2] riscv: Fix build against binutils 2.38 + +The following description is copied from the equivalent patch for the +Linux Kernel proposed by Aurelien Jarno: + +>From version 2.38, binutils default to ISA spec version 20191213. This +means that the csr read/write (csrr*/csrw*) instructions and fence.i +instruction has separated from the `I` extension, become two standalone +extensions: Zicsr and Zifencei. As the kernel uses those instruction, +this causes the following build failure: + +arch/riscv/cpu/mtrap.S: Assembler messages: +arch/riscv/cpu/mtrap.S:65: Error: unrecognized opcode `csrr a0,scause' +arch/riscv/cpu/mtrap.S:66: Error: unrecognized opcode `csrr a1,sepc' +arch/riscv/cpu/mtrap.S:67: Error: unrecognized opcode `csrr a2,stval' +arch/riscv/cpu/mtrap.S:70: Error: unrecognized opcode `csrw sepc,a0' + +Signed-off-by: Alexandre Ghiti +Reviewed-by: Bin Meng +Tested-by: Heinrich Schuchardt +Tested-by: Heiko Stuebner +Tested-by: Christian Stewart +Reviewed-by: Rick Chen +--- + arch/riscv/Makefile | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 0b80eb8d86..53d1194ffb 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) + CMODEL = medany + endif + +-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ ++RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C) ++ ++# Newer binutils versions default to ISA spec version 20191213 which moves some ++# instructions from the I extension to the Zicsr and Zifencei extensions. ++toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei) ++ifeq ($(toolchain-need-zicsr-zifencei),y) ++ RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei ++endif ++ ++ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \ + -mcmodel=$(CMODEL) + + PLATFORM_CPPFLAGS += $(ARCH_FLAGS) +-- +2.30.2 + diff --git a/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0002-exclude-opensbi-memory-range-in-device-tree.patch b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0002-exclude-opensbi-memory-range-in-device-tree.patch new file mode 100644 index 00000000..0a19707f --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0002-exclude-opensbi-memory-range-in-device-tree.patch @@ -0,0 +1,40 @@ +From 0e037ddfc425ad716afb0120db8c6e92fe9a2802 Mon Sep 17 00:00:00 2001 +From: Felix Moessbauer +Date: Mon, 30 Jan 2023 11:05:01 +0800 +Subject: [PATCH 2/2] exclude opensbi memory range in device tree + +This patch explicitly excludes the memory range of the OpenSBI in the +built-in device tree. When booting EFI, the efi loader has to know +about that zone before loading the device tree for Linux, otherwise +it tries to access 0x40000000, leading to an access violation. + +Signed-off-by: Felix Moessbauer +--- + arch/riscv/dts/starfive_visionfive2.dts | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/arch/riscv/dts/starfive_visionfive2.dts b/arch/riscv/dts/starfive_visionfive2.dts +index 4dcfa1bacb..9c1dce7363 100644 +--- a/arch/riscv/dts/starfive_visionfive2.dts ++++ b/arch/riscv/dts/starfive_visionfive2.dts +@@ -34,6 +34,17 @@ + reg = <0x0 0x40000000 0x1 0x0>; + }; + ++ reserved-memory { ++ #size-cells = <2>; ++ #address-cells = <2>; ++ ranges; ++ ++ opensbi { ++ reg = <0x00 0x40000000 0x00 0x80000>; ++ no-map; ++ }; ++ }; ++ + soc { + }; + }; +-- +2.30.2 + diff --git a/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0002-riscv-support-building-double-float-modules.patch b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0002-riscv-support-building-double-float-modules.patch new file mode 100644 index 00000000..ec7d7d32 --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2/0002-riscv-support-building-double-float-modules.patch @@ -0,0 +1,89 @@ +From 5aefdcad0950c244d826988a8bd2f90584399849 Mon Sep 17 00:00:00 2001 +From: Heinrich Schuchardt +Date: Wed, 12 Oct 2022 14:59:51 +0200 +Subject: [PATCH 2/2] riscv: support building double-float modules + +The riscv32 toolchain for GCC-12 provided by kernel.org contains libgcc.a +compiled for double-float. To link to it we have to adjust how we build +U-Boot. + +As U-Boot actually does not use floating point at all this should not +make a significant difference for the produced binaries. + +Signed-off-by: Heinrich Schuchardt +Reviewed-by: Rick Chen +Reviewed-by: Leo Yu-Chi Liang +--- + arch/riscv/Kconfig | 15 +++++++++++++++ + arch/riscv/Makefile | 15 ++++++++++++--- + 2 files changed, 27 insertions(+), 3 deletions(-) + +diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig +index 0cf51799fe..25ed0ba1cf 100644 +--- a/arch/riscv/Kconfig ++++ b/arch/riscv/Kconfig +@@ -161,6 +161,21 @@ config RISCV_ISA_C + when building U-Boot, which results in compressed instructions in the + U-Boot binary. + ++config RISCV_ISA_F ++ bool "Standard extension for Single-Precision Floating Point" ++ default y ++ help ++ Adds "F" to the ISA string passed to the compiler. ++ ++config RISCV_ISA_D ++ bool "Standard extension for Double-Precision Floating Point" ++ depends on RISCV_ISA_F ++ default y ++ help ++ Adds "D" to the ISA string passed to the compiler and changes the ++ riscv32 ABI from ilp32 to ilp32d and the riscv64 ABI from lp64 to ++ lp64d. ++ + config RISCV_ISA_A + def_bool y + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 53d1194ffb..4963b5109b 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -5,15 +5,22 @@ + + ifeq ($(CONFIG_ARCH_RV64I),y) + ARCH_BASE = rv64im +- ABI = lp64 ++ ABI_BASE = lp64 + endif + ifeq ($(CONFIG_ARCH_RV32I),y) + ARCH_BASE = rv32im +- ABI = ilp32 ++ ABI_BASE = ilp32 + endif + ifeq ($(CONFIG_RISCV_ISA_A),y) + ARCH_A = a + endif ++ifeq ($(CONFIG_RISCV_ISA_F),y) ++ ARCH_F = f ++endif ++ifeq ($(CONFIG_RISCV_ISA_D),y) ++ ARCH_D = d ++ ABI_D = d ++endif + ifeq ($(CONFIG_RISCV_ISA_C),y) + ARCH_C = c + endif +@@ -24,7 +31,9 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) + CMODEL = medany + endif + +-RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C) ++ ++RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_F)$(ARCH_D)$(ARCH_C) ++ABI = $(ABI_BASE)$(ABI_D) + + # Newer binutils versions default to ISA spec version 20191213 which moves some + # instructions from the I extension to the Zicsr and Zifencei extensions. +-- +2.30.2 + diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-v2.8.0.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-v2.8.0.bb new file mode 100644 index 00000000..8f58dc24 --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-v2.8.0.bb @@ -0,0 +1,44 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +require recipes-bsp/u-boot/u-boot-custom.inc + +SRC_URI += " \ + git://github.com/starfive-tech/u-boot.git;branch=JH7110_VisionFive2_devel;protocol=https;destsuffix=u-boot-${PV} \ + file://starfive-visionfive2/0001-riscv-Fix-build-against-binutils-2.38.patch \ + file://starfive-visionfive2/0002-riscv-support-building-double-float-modules.patch \ + file://starfive-visionfive2/0001-fix-offset-of-env-data-block-on-jh7110.patch \ + file://starfive-visionfive2/0002-exclude-opensbi-memory-range-in-device-tree.patch \ + " +SRCREV = "f1d959f0b02e16842181a4c1723ba3ea30d2e04a" + +DEBIAN_BUILD_DEPENDS .= ", libssl-dev:${HOST_ARCH}, libssl-dev:${DISTRO_ARCH}" + +# TODO: analyze the strange cross gcc include chain +DEBIAN_BUILD_DEPENDS .= ", libc6-dev-i386:${HOST_ARCH}" + +U_BOOT_CONFIG = "starfive_visionfive2_defconfig" +U_BOOT_BIN = "u-boot.bin" +U_BOOT_SPL_BIN = "spl/u-boot-spl.bin" + +S = "${WORKDIR}/u-boot-${PV}" + +# inject debian multi-arch include path +KCFLAGS += "-I/usr/include/$(DEB_HOST_MULTIARCH) -I/usr/$(DEB_HOST_MULTIARCH)/include" +HOSTCFLAGS += "-I/usr/include/$(DEB_BUILD_MULTIARCH) -I/usr/$(DEB_BUILD_MULTIARCH)/include" +# define host architecture bitwidth +KCFLAGS += "-DBITS_PER_LONG=$(DEB_HOST_ARCH_BITS)" + +# install dtb files for opensbi +do_prepare_build[cleandirs] += "${S}/debian" +do_prepare_build:append() { + # also build and install spl component + sed -i 's|${U_BOOT_BIN}|${U_BOOT_BIN} ${U_BOOT_SPL_BIN}|g' ${S}/debian/rules + echo "${U_BOOT_SPL_BIN} usr/lib/u-boot/${MACHINE}/" \ + >> ${S}/debian/u-boot-${MACHINE}.install + # install device tree + echo "arch/riscv/dts/*.dtb usr/share/u-boot/${MACHINE}/" \ + >> ${S}/debian/u-boot-${MACHINE}-dev.install +} From patchwork Fri Mar 17 13:21:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2733 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Mar 2023 14:21:49 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f55.google.com (mail-lf1-f55.google.com [209.85.167.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 32HDLmO6005535 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Mar 2023 14:21:48 +0100 Received: by mail-lf1-f55.google.com with SMTP id y9-20020a056512044900b004b4b8aabd0csf2028835lfk.16; Fri, 17 Mar 2023 06:21:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1679059303; cv=pass; d=google.com; s=arc-20160816; b=lljmFbTAIlr8c7Uryp1vu/j9EN7yMGQedO7QVHkkzJdA8n4DyrPorDL4ZzXi6Met5h ciPgtNEjAvJTs053YVIJSAuPQu2PUYSowLbKam7Aqiw6GX2cn3ET0Gonk9pu69IXjIoD OLmVavb+3kHpAX7C7/9eS+7wgIuNsi9nNWVmrq7J4SL5q4nad0ANqaAPlZiVR0F+ziHy 0aHDPnncqria9roPJEvQs+4Q8r8eA87VyAsDlGjtCIp5nBXjZvQPX1VUIn3eizSeYTej UUGFuFq1QiKEoF2jX1n2WbrMRLUbsaap0azaWtrdkJLkM/Vvm0MTCKgkiXd684W1A2Ih fi2g== 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=7xHGgYYhuPxlcVqMSYmy78L85WVVlWXK70hx7xFv9/U=; b=zzGlCuJzCRK3oXAfEZSzJ0o4LptgaXYrNtHXuRvQqBn7M/6rM50DvFJ25aLCZzZG4G nJ3VG6sKjC9EibM93wY/kOEN6VsSJXENks6PELm9HspOXIsJHVC67JTSOX7TwWXLHMmH QsjnyLx7Wc7JKPe+Yq0315WSlyZ8yPRA3MygD24+FIkUWtEeXDlotF1V0URMNKlX4xSD kgQr52MHTjUW78v1Ozd9HSYfVDcaPj9IvpfELR8m0orb6OcxwAjej4gztm97rTQxoNzW KveOSaP4v28txKrViBglXLjwEKp54+oSuU0BjbbqdluI69DhlVVJmxseHyRXonrW1Phw KS6g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=VX1G5miB; spf=pass (google.com: domain of fm-72506-20230317132140a1e1619a4560d9ee69-6ttfyt@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230317132140a1e1619a4560d9ee69-6TtFyT@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; t=1679059303; 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=7xHGgYYhuPxlcVqMSYmy78L85WVVlWXK70hx7xFv9/U=; b=NO8ltlBpdKeyO4M3Lh72m3G/WxaB/FnrEu96qdtZxD/Eu2f3FbADzRNzFq344PUJg+ OVdTveC0OkkrBuiYJpUDLqQITC0rSnIEummerr146uH+k/q9sKiOgfy5geuulpuzHTXl ugkSGIsXRutgyhbH6WdzoHUuDP8ZfsR82+BVEcXLOingzwAoS7ua3aynczNEgnGYkNPd 04cNyR/QTYH4ZHIeBwX2y0CkG0iH9LkqJY89gPTqXzhIvhr9BUqcWu8ZybdcxzazRueb itU8+kgx3nTh3N273FN0tj6J9BiZV772kh/lUVL6CVk8d68Hzg9HdVghw6GfbEFyfNci HwhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679059303; 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=7xHGgYYhuPxlcVqMSYmy78L85WVVlWXK70hx7xFv9/U=; b=uc2Kdh6j2UWGXfVYnV29e2FBCzYfPoPqEPh495Nw2rRPUZQBvyOLoQQSUts+SgYcAQ V61EMJhC1Ouii+WgfICote5f6nvjf8c552dkksMr+bMVWGEY/51lSiGoomU+HSbA29JR 1AuNWg9UIk3DZNcbpZ340Ao/uD3b8MMeIo1DBn0Ishzgtp0TkV8Ym0CqKE1vZmOnpu1f 7L6IM3re5i6z33gxPaiTaI1pV0+kW8LKYTcSHpIRUKYlgYxRED+zmjypYF3fOysmXS1+ zNN574WeejSO1BXx9D091kE8OvPaTAJ2eWbB9+gNH21tdZFbHC18WOKZf49Bb0DLBRwl GhiQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXHVzAjg9nLeJvrUPSr7MN6h8IkU09RsHq5TpL9CwMNTTVABWpN omB/b8GrQB5xZ64u+ReY4RmhWw== X-Google-Smtp-Source: AK7set86pP6/SP/Cr7AbjF7eZIj+gdK+ReWc8jm57RActW8dk1hgaMgaftXCsKliZO0oDk8GgB0OwQ== X-Received: by 2002:ac2:4a65:0:b0:4db:1a8b:1b87 with SMTP id q5-20020ac24a65000000b004db1a8b1b87mr4327091lfp.8.1679059302884; Fri, 17 Mar 2023 06:21:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:15a4:b0:4e8:3ee1:db1a with SMTP id bp36-20020a05651215a400b004e83ee1db1als381406lfb.0.-pod-prod-gmail; Fri, 17 Mar 2023 06:21:41 -0700 (PDT) X-Received: by 2002:a05:6512:15d:b0:4e8:61d2:72ee with SMTP id m29-20020a056512015d00b004e861d272eemr2884763lfo.5.1679059301182; Fri, 17 Mar 2023 06:21:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679059301; cv=none; d=google.com; s=arc-20160816; b=sjVP09QYvmM8xOFuGpfZE48JZ6sMv0HTPCx+qcK7sQ0JF34eYw0cgWvxccd+5FyyNp zMml/Bfzn8s6Y3GzQRSGdRRSksvxZ9LsjR0Xz+pKh1A67nrFbt9yNIu4VJ1uiwdmnIb1 GZnSWS7K6/zCJfdDSNj1+fvhokaMYnoXLIHbU0mmTgr+yBsIdLoYCszZuuGprjbL4Qsg NrTZqmZzE3XLIknUzHg4f9zBIu77oBOOdgX5GqFZ1spYF7qFWtv8cM0cbCLbWgHRbM8w cR+pgMSGBTvggylyjAw182LmX3vOmHIgmyVNr2AP3sZUEu4woIPr494535jnY3BNtCBq bCGQ== 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=cNmm1GUGSmrs608iUfzXZM6akhw/WOdTe7fwNExpt1M=; b=0Vu2GStYuQBREdAzxeHlsEBkStWQfhaZxY5Ub19eY63HH3L6U6QWLX0SGOx4kaGdYI rdFGp9xDExnKURJMil4mLSPMKMn7cBTYJOuOAEjj3ZSHyY4SpFFdDwpfQmIpMRdpMESh rvzqKL/vzHz3qsyScm8SC+aNfr0tUIymKJNMMmt03CysD5va+/QvJc4dErW/8I/Nf7Q1 nqJ38Qsb+fY59Qi5rvDxi/YlVbyteg7Bdg/HtvTERV4+GYombhRrCdzdJfZltm2wtaLP UaKlLU3jxT1Gc/n8Z0IPslsxaBCTedvLlfmxM8ouoVPHEJI2whnb2Q/Ndxx0gl8+SpAG UQog== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=VX1G5miB; spf=pass (google.com: domain of fm-72506-20230317132140a1e1619a4560d9ee69-6ttfyt@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230317132140a1e1619a4560d9ee69-6TtFyT@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id b8-20020a0565120b8800b004e899899d5csi94422lfv.5.2023.03.17.06.21.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2023 06:21:41 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230317132140a1e1619a4560d9ee69-6ttfyt@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230317132140a1e1619a4560d9ee69 for ; Fri, 17 Mar 2023 14:21:40 +0100 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 3/7] starfive-visionfive2: package opensbi firmware Date: Fri, 17 Mar 2023 14:21:02 +0100 Message-Id: <20230317132106.1111258-4-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 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=VX1G5miB; spf=pass (google.com: domain of fm-72506-20230317132140a1e1619a4560d9ee69-6ttfyt@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230317132140a1e1619a4560d9ee69-6TtFyT@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.5 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NUMERIC_HTTP_ADDR,RCVD_IN_MSPIKE_H2,SPF_PASS, URI_HEX autolearn=no 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 opensbi firmware for the starfive visionfive2 board, based on the official BSP package. Signed-off-by: Felix Moessbauer --- .../files/starfive-visionfive2-rules.tmpl | 17 ++++++++++ ...ensbi-starfive-visionfive2_1.2+20230310.bb | 31 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl create mode 100644 meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb diff --git a/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl b/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl new file mode 100644 index 00000000..5f35c1c2 --- /dev/null +++ b/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- +endif + +UBOOT_DTB_FILE := /usr/share/u-boot/starfive-visionfive2/${DTB_UBOOT_JH7110_VF2} +FW_TEXT_START := 0x40000000 + +override_dh_auto_build: + CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=generic \ + FW_PAYLOAD_PATH=/usr/lib/u-boot/starfive-visionfive2/u-boot.bin \ + FW_FDT_PATH=$(UBOOT_DTB_FILE) \ + FW_TEXT_START=$(FW_TEXT_START) + +%: + dh $@ diff --git a/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb b/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb new file mode 100644 index 00000000..11e92b89 --- /dev/null +++ b/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb @@ -0,0 +1,31 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +inherit dpkg + +DESCRIPTION = "OpenSBI firmware for StarFive VisionFive 2" + +SRC_URI = " \ + git://github.com/riscv-software-src/opensbi.git;destsuffix=opensbi-${PV};protocol=https;branch=master \ + file://starfive-visionfive2-rules.tmpl" +# required patches are not yet part of a release, but will be in 1.3 +SRCREV = "c6a092cd80112529cb2e92e180767ff5341b22a3" + +S = "${WORKDIR}/opensbi-${PV}" +TEMPLATE_FILES += "starfive-visionfive2-rules.tmpl" +TEMPLATE_VARS += "DTB_UBOOT_JH7110_VF2" + +DEPENDS = "u-boot-starfive-visionfive2" +DEBIAN_BUILD_DEPENDS = " \ + u-boot-starfive-visionfive2, \ + u-boot-starfive-visionfive2-dev" + +do_prepare_build[cleandirs] += "${S}/debian" +do_prepare_build() { + cp ${WORKDIR}/starfive-visionfive2-rules ${WORKDIR}/rules + deb_debianize + + echo "build/platform/generic/firmware/fw_payload.bin /usr/lib/opensbi/starfive-visionfive2/" > ${S}/debian/install +} From patchwork Fri Mar 17 13:21:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2734 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Mar 2023 14:21:50 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f190.google.com (mail-lj1-f190.google.com [209.85.208.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 32HDLnnQ005538 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Mar 2023 14:21:49 +0100 Received: by mail-lj1-f190.google.com with SMTP id bg40-20020a05651c0ba800b0029a7c925073sf537433ljb.2; Fri, 17 Mar 2023 06:21:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1679059303; cv=pass; d=google.com; s=arc-20160816; b=plS+YXV7ra864YeGcR7GShoJV8RN5YDueld3GMv8sfj4WMDY+3jKpZlkbCuoRwyT6b VwSC0hl5hSlytbC4gPaWRthwlAETXce9DUTDUaOeHC950bQSm97w33URlRXXT+zzZq8E OEjULDvN4/EVf6j4Mu6T4Fin7tE/OQCUIHdbWmc9jddcuwOsVpKRFki6BfvqGm6GCoaz n1UBqp9Lr/Q3hDjYr9/Eh3h1K6yMqZS3iR2mi4ilSVTc79Pcng2SgjQ/DC0KvYRanzo4 AOFY/fpRsjctDhXi4ekVXMJdYqIFDNMSp7hU3S5PaaBGRhq0Zg8BPDhyls8KkPEGM7hG TQ+w== 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=mWprc8kQP6GRBFwqwp1i099jkLo5IrfTdepg4OZ4RFs=; b=yeCH/RIaRZCe947Lbzh4c2tV7NkhHx4WGfIzzJiwkm7LTKkFU8TJcmwgFi1sABV0Wm EoRSifBpiEh3GsObIbF4hPL+HGqocf2YDKpMIig4GWRi2sBGAT29kfLK/OLZGJKYk5OE xJj2qSAKuLYzK2Sit2xutFq8/Hf7rhPenCuh99D0rIb6g3lZN+4fd8A+/YgAbM67KJIp 219mZTX1hflBP/9ZYnUIXvgQ3STBGWxYKpUE9AzbNGTjNBQZf+aWWhK/3j6ckv6EDOKX 8rBcC4HWxXzBhaKqGG1Fu+uPhN03brI2J0zts/u8pW2dVQ7vM5stNkJ5yWl6VOylbC4K 2g6A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DmO+6YcX; spf=pass (google.com: domain of fm-72506-202303171321413412a62b8ab3186ef0-wihe8g@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202303171321413412a62b8ab3186ef0-wIhe8G@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; t=1679059303; 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=mWprc8kQP6GRBFwqwp1i099jkLo5IrfTdepg4OZ4RFs=; b=ZV+FPsUwKXYXnsy0mA/md7YaLV20c1gGNWIXdFYXtMLDLelf9Af1kQ6jBiM852UtYx aY75Bk2PE5mSMnBqfFq/Y2WjFVhVB1cqgdWjusgPo7J5+AC+10Q/KiIdgsIqSFykRnj3 /BlxstubvYHQcyTN4mZPEGg7x+rDrj1ruVHwjfwD0NgCrX9+YoDQS5ZlM656BO6WwA7d Lwmo4C2oX3mosEovXgSy+BqA5uiUs3fjggCftd+PF6PW+mVE1pBga2LXrFTsWXhvCyT5 H5VI4Hx0FaAGSQrU8PNeMHrXuzojNhEmvKH+6+DSAM3ZcJraHHx4uKSvNDiYwFmThfeW BWdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679059303; 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=mWprc8kQP6GRBFwqwp1i099jkLo5IrfTdepg4OZ4RFs=; b=wDfojCpqYbAa12Nwknb5zMXX/XtjLjWTlM0tbJ1NlS2CIIA1y+SPgdqwkcvvlR/ygf BsCHFslkGHIGCwf+oTMUMxoAJsUNEqemC1FfryPq5MU3Srdd/9XdYVkmWpFXQnrSwE3S HmPf3RAw9wSaxQvWPxYQW6fkXwAeCbj0/geQNSj8Ne2V7O9DV1Hfu8JR4T0dw7GZHYBe FqDbRbEx8haJGnedqHDXDb7E+dDXrRG4jRotiFY6KRwxG6IjgidNY5mpurAgWxQ6mdVj 7RGYk93lEs4oUtIJkZ33X8d8P/DRSxGiQnjuy339JvMAamwbCLq8cFvXTIDNXyuOG9ju NgYA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXsM9fjAits7q8mQxL92Q7BCMQ0EfPfz/OKdQm9UsxRvgexfPLM xeEZqfkyIIABI5SJ3fS1Gn8= X-Google-Smtp-Source: AK7set8kwMoVEzL5F2isipZjN8vmcNuz05Z/9OyFKIXw8oQz31x20GhWFeBrPqw6E9lnM9WT20OSjw== X-Received: by 2002:ac2:5503:0:b0:4d5:ca42:e438 with SMTP id j3-20020ac25503000000b004d5ca42e438mr4234587lfk.1.1679059303714; Fri, 17 Mar 2023 06:21:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:be8a:0:b0:295:b83a:4ad6 with SMTP id a10-20020a2ebe8a000000b00295b83a4ad6ls1033164ljr.3.-pod-prod-gmail; Fri, 17 Mar 2023 06:21:42 -0700 (PDT) X-Received: by 2002:a05:651c:2117:b0:298:6a97:5985 with SMTP id a23-20020a05651c211700b002986a975985mr4698367ljq.43.1679059302005; Fri, 17 Mar 2023 06:21:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679059301; cv=none; d=google.com; s=arc-20160816; b=rNV3g9UQFgXmEA/HEiMC7IwTbrkw2CP/CJUEiPp9eWakBGdIJ6S7TyvTQyZ3MwR14M FmCSo2IggfzmyJdVyasAoLW7fnLytW2CVSBqXXGpZupI++MwQF3FbEX2PQ5MesIBanEy 2JcSYe64OzXOnd8RzdSbX2gNixCLrqY1q5JYk1+wn2lprGY2IUz4w1QPIjLr75UfdIr2 GqenL3AvLQahXuDAADfzyB0Vb5q24a1C/tFFd5XUKB7W3rnhCeACxHfTqBg2S2Mb4c8x 48N9IJc26FLX+32VplGrbrmzLhFFKPDVlHHOspITZr0ewcRS1CJew0U0dBxTzOPUsfO5 Xi2w== 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=y97MLG5dlBudSyE+RSlFw2mDww1OLCkQfmqTeIxegg4=; b=KfurUpIhrG1vNtpYqc/qI8tMaIM0j24/mY5qKs8cV+Vomg94CPq8OKuSa3Xn+gRy+E xHka7kjJqAg1M8KaCkliIhxy4CyYEbIk6nGOef8s6fT9ShkrPQKOANSAXuB0lIEPL5KM AH7M3RvPY6VxoWqh9BTyvq9+ycDyMafinFRd3YabFuRH4Rl5J5YUKnkntl73QV0FKb1y X6JSBB0bdrNy0Y49eV1eMfp4+VUFIOTH4Z+yx844qky5gbmrGV/eL0lUmBwkNJMnAKoO r/wH+G8KzEZjD81T1egDBeh8eBrTEGtUk4vX0MRk/HUziF2tnp5fLJOM0ySXmo1Da6yM TB3g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DmO+6YcX; spf=pass (google.com: domain of fm-72506-202303171321413412a62b8ab3186ef0-wihe8g@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202303171321413412a62b8ab3186ef0-wIhe8G@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id f17-20020a05651c03d100b00295a08c1798si50796ljp.1.2023.03.17.06.21.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2023 06:21:41 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202303171321413412a62b8ab3186ef0-wihe8g@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202303171321413412a62b8ab3186ef0 for ; Fri, 17 Mar 2023 14:21:41 +0100 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 4/7] starfive-visionfive2: add BSP kernel Date: Fri, 17 Mar 2023 14:21:03 +0100 Message-Id: <20230317132106.1111258-5-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 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=DmO+6YcX; spf=pass (google.com: domain of fm-72506-202303171321413412a62b8ab3186ef0-wihe8g@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202303171321413412a62b8ab3186ef0-wIhe8G@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 kernel (including configuration) from the SDK package. To make this kernel build on gcc12, we add a patch that fixes the machine model. Signed-off-by: Felix Moessbauer --- ...or-unrecognized-opcode-csrr-a5-0xc01.patch | 26 +++++++++++++++++++ .../linux/files/starfive2_extra.cfg | 3 +++ .../linux/linux-starfive_5.15-visionfive2.bb | 18 +++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 meta-isar/recipes-kernel/linux/files/fix-Error-unrecognized-opcode-csrr-a5-0xc01.patch create mode 100644 meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg create mode 100644 meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb diff --git a/meta-isar/recipes-kernel/linux/files/fix-Error-unrecognized-opcode-csrr-a5-0xc01.patch b/meta-isar/recipes-kernel/linux/files/fix-Error-unrecognized-opcode-csrr-a5-0xc01.patch new file mode 100644 index 00000000..b4dcaf0d --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/fix-Error-unrecognized-opcode-csrr-a5-0xc01.patch @@ -0,0 +1,26 @@ +From 2f75442523e4b44bdea4ae5bc2e95137d0303c8b Mon Sep 17 00:00:00 2001 +From: LIChengGang <43427321+Zeno-sole@users.noreply.github.com> +Date: Thu, 12 Jan 2023 10:52:05 +0800 +Subject: [PATCH] fix: Error unrecognized opcode `csrr a5,0xc01 + +--- + arch/riscv/Makefile | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 0eb4568fbd290..c18d87212177b 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -52,6 +52,12 @@ riscv-march-$(CONFIG_ARCH_RV32I) := rv32ima + riscv-march-$(CONFIG_ARCH_RV64I) := rv64ima + riscv-march-$(CONFIG_FPU) := $(riscv-march-y)fd + riscv-march-$(CONFIG_RISCV_ISA_C) := $(riscv-march-y)c ++ ++# Newer binutils versions default to ISA spec version 20191213 which moves some ++# instructions from the I extension to the Zicsr and Zifencei extensions. ++toolchain-need-zicsr-zifencei := $(call cc-option-yn, -march=$(riscv-march-y)_zicsr_zifencei) ++riscv-march-$(toolchain-need-zicsr-zifencei) := $(riscv-march-y)_zicsr_zifencei ++ + KBUILD_CFLAGS += -march=$(subst fd,,$(riscv-march-y)) + KBUILD_AFLAGS += -march=$(riscv-march-y) + diff --git a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg new file mode 100644 index 00000000..d11c28de --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg @@ -0,0 +1,3 @@ +# additional configuration to support stock debian userlands +CONFIG_BINFMT_MISC=y +CONFIG_SQUASHFS=m diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb new file mode 100644 index 00000000..cd737de0 --- /dev/null +++ b/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb @@ -0,0 +1,18 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +require recipes-kernel/linux/linux-custom.inc + +SRC_URI += " \ + git://github.com/starfive-tech/linux.git;protocol=https;branch=JH7110_VisionFive2_devel;destsuffix=linux-visionfive-${PV} \ + file://fix-Error-unrecognized-opcode-csrr-a5-0xc01.patch \ + file://starfive2_extra.cfg" +SRCREV = "4639179fefcf0ba72fb3dd2475bddf4148aeeed4" + +S = "${WORKDIR}/linux-visionfive-${PV}" + +KERNEL_DEFCONFIG = "starfive_visionfive2_defconfig" + +LINUX_VERSION_EXTENSION = "-isar" From patchwork Fri Mar 17 13:21:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2735 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Mar 2023 14:21:50 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f62.google.com (mail-lf1-f62.google.com [209.85.167.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 32HDLnkH005539 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Mar 2023 14:21:50 +0100 Received: by mail-lf1-f62.google.com with SMTP id i16-20020ac25b50000000b004b565e69540sf2019657lfp.12; Fri, 17 Mar 2023 06:21:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1679059304; cv=pass; d=google.com; s=arc-20160816; b=V1Z945K4VdqUOreoVLN5aRIzCHRpJczSv4p5+0yqdBtGSRF875E5w04DkGh41KzvJv Q0WL/UEWkW+SVGH0/oB1J5GiwHLRAwyAkVjZFMMAfGE4bdiMyaIEPuECroewwXng64lB IRVkMBCyiLwSr5puFDmlGVlWD8KUv11vb5EGZ8NQ8YPxIXTUvv6toL3DsDmElajQNDyc uzUl3ruWU/9Iu53EGsuZqg6HnWDxk4m2sHfRS2SOCfv7Jh8vVdZBLzdKBZw64Yj6mkyP rF+KDrT1rfgeJ4sK0/9wWF50p/Hn5ZaWKzUpiGdt+mcmGmK5fAgVcaG2FEywWL5UNpQT aIEw== 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=12FczjzHlziVaPARKAgj7ZHCGU1CQzXUYspQbr5hC40=; b=qG4kBR/d8dew+KJqxsmgbYbHtdTwy41E5+sBFNKIyH7sHmcFTvDe0ZlIDtC3jcqlVE 5E/pyP/MuMPq9dd1cxquqQ6KHbBfqp+07kcoilniWKaEWX2xV4Uhh7+3b+mhAxnA9g4t F6J0C8AIo6nWIGky6g4FLY6vbylmBaNJV5UjBMWm+y7R789tUmMmjdp86TiOHP6+H5CH vOizRlAyOXLZhVFuK7iyYQ3pjVRVPoy8lBLoOjF6tUb8evchbXrBcvtq1XCQNZze86kT O3u/PaFiBRNGpJzvdMMIGCo3KZWKFqLPfzVuHaw3ZxVXlOFgrjWCJy8YsWrmFMKBi7G3 0YnQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Gouf1dTs; spf=pass (google.com: domain of fm-72506-20230317132142a16e3c14f119e49f90-e7u57l@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230317132142a16e3c14f119e49f90-e7U57L@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; t=1679059304; 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=12FczjzHlziVaPARKAgj7ZHCGU1CQzXUYspQbr5hC40=; b=SUtkHZBItWYMLgeXKR7OnqgtBmJe210mbSABEqIBcy+TI14qUItVjQBEvs8SnVyWYZ 7S8O+76Dp/nKht7Ei+H7LZtoXe3dogqfL8lLi3q0vZLIAYV6FjASpJV05ajXjgncIlwi tc437w2hUYH6p/8ZrMbviHF1+ZBlGomEzCgLvJaWIyn4axpQG2ONLumWxed6JKj4otEs EXUIMYo6TC2FB28+a0JrZqH/G6HF3yAsq0a0PMp8HxJ2H1xDaPe6psO7stuNB65+i4HA qaKll+UgQC044OCznVT7OGcU3YLD8OMIsxpfIbBZxVgyXeRZKBQ+4XYdGdXCrqfZ+1q+ /8sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679059304; 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=12FczjzHlziVaPARKAgj7ZHCGU1CQzXUYspQbr5hC40=; b=yxNHT8p8ECU0MvzTi0qWRz0hPVmOCcIwzLB3mxgTzu6wo47j/MwWS2R4MA6liiqntc Mp76aHcI1IYAR2EVgY6Btn96UyO0Nn3uq+rxJYk0jwc4B4Vp4k/WempENMh9X0KeD8+R LWf4qb9/q2BwlZhR+9Nd7hdsMBRAz+FsnxSyYSqQz4IyKSUnXVH46jdcdV3Xhf6hzfkA kzfnSqgoI6dXf4mO7FXDmPUipq4br5gnrq6KTFIRWMAy3nNIlJLR1x6DwQxu+TmWzz7k o0c+fA+OOr/6n1YOIDQzJOtNHSM7J7yRPFT7b4BQPovIrW8Us67z3nwMFFCgzW7HWz6g vUsg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKUeqRow6QpnB8BgrC8NGrDzn87qGRhN5AC3NnLYWneLqxWTD847 qUp+CBRrgdbNFA6Q2Tc4jxU= X-Google-Smtp-Source: AK7set8MarjUtoiFb5GlLQeTyXsi47ruW6/CiFKMF1HE8DRJ9enSCWyX5OoFEFhWURfEuzU6h8h6NQ== X-Received: by 2002:a05:651c:b9b:b0:293:4be3:9e6c with SMTP id bg27-20020a05651c0b9b00b002934be39e6cmr3371538ljb.1.1679059304634; Fri, 17 Mar 2023 06:21:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:368f:b0:4e8:6261:7dc1 with SMTP id d15-20020a056512368f00b004e862617dc1ls380670lfs.2.-pod-prod-gmail; Fri, 17 Mar 2023 06:21:43 -0700 (PDT) X-Received: by 2002:a05:6512:11f2:b0:4e8:20f6:83f4 with SMTP id p18-20020a05651211f200b004e820f683f4mr3963452lfs.21.1679059302915; Fri, 17 Mar 2023 06:21:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679059302; cv=none; d=google.com; s=arc-20160816; b=vm3QQ/1jtrACXXwDcoBFjvIVfGe+iwICvorPOtVfUL8AZaK6yZ6372iSDD6vMJ8YHw roZUEU089AQBVqJ1qKNMmlU18XKRp6CmAFMI7X9N/q+M+NtgZ7+k6lbkC+E0holuq1id 6gNMxyue1UI8RGn1K+sPSF64gB8wMmcae3LFH2jdnbZl0L3U56H164HQDjf3hEX+3Lvw Sibdv3pWpATyXiCM+vO0Ow1KEPLXF3s2DqH2of1KVy67Fcw29hSQG4kmzUlZK8nBfPmU lesE7RPweGfaO5d9cspTRBpU5Kp1fiwRb2mmUTe5HNFdBYsjmCS6BWbG90VPXhdK6Z+9 bzyA== 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=TLVkVmIvLjwhPQy/ffVzGrV4BjAnfPRswlK/62HOJmQ=; b=AUj59/9lmd5azXrJMoKkSkqonMG054dJBmS3Y0s5oUGD1h4FqkvVNNKMACnX/svPlD mVS/7w3uciaFGmpp3ZkIsTkVHAdm6KgF82W3C5cKWlaIVGYOM6U4MJmnf+bOmcicQhYZ O9bbLYWhyM8DY6bvM7xVpVFjbfL0ApvHDRzhTfPqARCVCpxXBFGJXrA/jKAXHB/o2pxs +XmOO3qY/8pYkxBOHffpFxmpjUnvK8l9MVOKCtg8z2xMlSh+zSwK9grznOUEIasf3ffT B0lMnciGbyTeJdi1qnE9JsvwB6buQXwnAUauKFfZFROfpTMobGgYgX0ANStVRHOy1rYh 5Muw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Gouf1dTs; spf=pass (google.com: domain of fm-72506-20230317132142a16e3c14f119e49f90-e7u57l@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230317132142a16e3c14f119e49f90-e7U57L@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id b8-20020a0565120b8800b004e899899d5csi94422lfv.5.2023.03.17.06.21.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2023 06:21:42 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230317132142a16e3c14f119e49f90-e7u57l@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230317132142a16e3c14f119e49f90 for ; Fri, 17 Mar 2023 14:21:42 +0100 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 5/7] starfive-visionfive2: create u-boot-spl firmware Date: Fri, 17 Mar 2023 14:21:04 +0100 Message-Id: <20230317132106.1111258-6-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 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=Gouf1dTs; spf=pass (google.com: domain of fm-72506-20230317132142a16e3c14f119e49f90-e7u57l@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230317132142a16e3c14f119e49f90-e7U57L@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?= Signed-off-by: Felix Moessbauer --- .../jh7110-u-boot-spl-image/files/install | 1 + .../jh7110-u-boot-spl-image/files/rules | 13 ++++++++ .../jh7110-u-boot-spl-image_0.1.bb | 30 +++++++++++++++++++ .../jh7110-u-boot-spl-tool_0.1.bb | 23 ++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install create mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules create mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb create mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install new file mode 100644 index 00000000..c300f842 --- /dev/null +++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install @@ -0,0 +1 @@ +u-boot-spl.bin.normal.out usr/share/jh7110-uboot-spl-image diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules new file mode 100644 index 00000000..3c28b2c0 --- /dev/null +++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f + +U_BOOT_SPL_BIN := /usr/lib/u-boot/starfive-visionfive2/u-boot-spl.bin +# taken from https://github.com/starfive-tech/Tools +OFFSET := 0x01010101 + +override_dh_auto_build: + cp $(U_BOOT_SPL_BIN) u-boot-spl.bin + /usr/lib/jh7110-uboot-spl-tool/jh7110_uboot_spl u-boot-spl.bin $(OFFSET) + mv u-boot-spl.bin.out u-boot-spl.bin.normal.out + +%: + dh \$@ diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb new file mode 100644 index 00000000..08c53b51 --- /dev/null +++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb @@ -0,0 +1,30 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +inherit dpkg + +SRC_URI = "file://rules file://install" + +DESCRIPTION = "StarFive VisionFive 2 u-boot SPL" +DEPENDS = "jh7110-u-boot-spl-tool u-boot-starfive-visionfive2" +DEBIAN_BUILD_DEPENDS = "jh7110-u-boot-spl-tool, u-boot-starfive-visionfive2:${DISTRO_ARCH}" + +# this is a host tool +PACKAGE_ARCH = "${HOST_ARCH}" + +do_prepare_build[cleandirs] += "${S}/debian" +do_prepare_build(){ + deb_debianize + cp ${WORKDIR}/install ${S}/debian/ +} + +do_deploy() { + dpkg --fsys-tarfile ${WORKDIR}/jh7110-u-boot-spl-image_${PV}*.deb | \ + tar xOf - "./usr/share/jh7110-uboot-spl-image/u-boot-spl.bin.normal.out" \ + > "${DEPLOY_DIR_IMAGE}/u-boot-spl.bin.normal.out" +} + +addtask deploy after do_dpkg_build before do_build +do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb b/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb new file mode 100644 index 00000000..1991e61a --- /dev/null +++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb @@ -0,0 +1,23 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +inherit dpkg + +DESCRIPTION = "replacement for proprietary VisionFive2 SDK spl_tool" +LICENSE = "CPL-1" + +SRC_URI = "git://github.com/electrorys/jh7110_uboot_spl.git;branch=master;protocol=https;destsuffix=jh7110-uboot-spl" +SRCREV = "e089116b902240659c1dcd6cbb6537dc4c1e316c" + +S = "${WORKDIR}/jh7110-uboot-spl" + +# This is a host tool +PACKAGE_ARCH = "${HOST_ARCH}" + +do_prepare_build[cleandirs] += "${S}/debian" +do_prepare_build(){ + deb_debianize + echo "jh7110_uboot_spl usr/lib/jh7110-uboot-spl-tool" > ${S}/debian/${PN}.install +} From patchwork Fri Mar 17 13:21:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2736 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Mar 2023 14:22:13 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f64.google.com (mail-ed1-f64.google.com [209.85.208.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 32HDMDDl005590 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Mar 2023 14:22:13 +0100 Received: by mail-ed1-f64.google.com with SMTP id q13-20020a5085cd000000b004af50de0bcfsf8050571edh.15; Fri, 17 Mar 2023 06:22:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1679059327; cv=pass; d=google.com; s=arc-20160816; b=grLF/cmYaVXZNAaFCiWmbECk+dQtMDGJaYLv90itOwKdpT4Fbd3Kmcs0h05J2ZnMwi Nj3JvDX5WNYauwkSimyCA/Sf/H9ePkGbLb9CDIUQb0d0cC9f09YfOEsuN8fh2hnI6R4c t5SQQEDEOhLnmsKXYAUU49tphEnNfV2AmxvzQUITEl8YsbwjOyA/zaI+Pud2gZxZdwYv 58u91YFS2EeRGFGobDErv7/vVCupy9aIP7WANren9iQoiWc17njtwH5jBkMHLzCU19bw /8/2cU6upKy/UOXxjmiQdW+CCUujX0HyhSo/oJNcsgL/a4BNlGzeiMS72889bT555hMl IrkQ== 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=zuN7B3Mzat6kyRxig5KQjCkEgNcPGmtcrK7e4gcKyoY=; b=HGN+47qV7WTWTWT5qliIbAXklKvwlXRyOCKvipfPUFkWg9hsqFtqZVqjC6pRGcPL8v nlz31N03iF3UNp6lLzLFvzmp1nAEB9PwGo9Z9QC4AkiDRP3gA+VE/sGI1vvbn7pVTh03 sWkwJcWSYDHIaxN3ZIXu1DO2M/SCw7S7/CvftL5HB1sqNMLDS8LgHqq1GvkBh4GNNGz9 oYXuVM2OnWh8e8i6xtIzH4nE7vZ9wn4bRjB8txMhUKU0pWV3SMrsdtaqUGUtaYmRI2iW 6fIzUDxCRRS6LtGkhooNlWvV3DZhYZ7IUZ46uXdmLvYCmMW1caATtNI6+B/XXlP6/ydG dcvw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hnxFVAbT; spf=pass (google.com: domain of fm-72506-20230317132205abf0d3b65e34a09a46-httcwa@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230317132205abf0d3b65e34a09a46-httcwa@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; t=1679059327; 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=zuN7B3Mzat6kyRxig5KQjCkEgNcPGmtcrK7e4gcKyoY=; b=emrlTFSd6tJ8QhLdhe4hVxOytYllLxonxk2JQI9c/wGwJKwaQa2tyC0QAj5t/RSPWn rlMO7/Yq0O6JaQuaSUBSDHcZ65MNdNJ8+PzKQFgPRX7frOZ0FCWWyaFW89kgpSu266cB wdPd8U8I/b1ijdMc1OFtoLiPpr741WQHWf9GgFFqqSc6O226ecCZK8c2nr11gCw9P8wr WyLR2YBniV27g0ri9rSdStiwT4fsWdttvAl/0mFNar90dXk8/z6urdyIXuAiZ06k+bpT ZVfMCwKiPkOu2GdwIItWVx4tYAGkYLK9MXh9y4uXstRftxzenqAs03etq3soS8pMfyl1 /kTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679059327; 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=zuN7B3Mzat6kyRxig5KQjCkEgNcPGmtcrK7e4gcKyoY=; b=MTmdA6nj7cE//tL8Cz0ieFATP0yPY14esFZqMzx4mj6nSU4bULSp7wLahk7qMQ6WVQ 7u72yduBpjlFoatF9rTd6CWLhH/SI+DsjbeWIXY57wYi3ix8nEEOEqdou1k0+Wcf6JlE CD6ixAQxVW6DYD9EQPUy++PaSCVz7zpK6qzGxcjTUGp9JT9NKF0I7Iw5Uer5vpdZy6l3 hyOigrU65Px1MB95jewKkteu62URjWJEC0RtMATe0M9B/mjvR2QeyzldMtQ6Ouhx7YOy fmMNnEt28UgCG809Xy/r5rKaltaiQlm0efWy79o/o0FczzfBihrZP7EipuOecCHxcvmo ylnA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKUyquuVfRnRKKaimqUC5JLfWY6RHadDzStjt3zjVQWHp7bJl/bk wtvXfDEyCPLCF8kJzTWAoGY= X-Google-Smtp-Source: AK7set+gMtZ7DnHb2h16bPKfrZ07Tjabx8n9kmjuIqQOzK2bENGHyu1ft6Sh9AmvR88qNHlahItK6g== X-Received: by 2002:a50:aadd:0:b0:4fb:30fc:1e99 with SMTP id r29-20020a50aadd000000b004fb30fc1e99mr1796698edc.0.1679059327606; Fri, 17 Mar 2023 06:22:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:2908:b0:4ac:b59b:6e28 with SMTP id ee8-20020a056402290800b004acb59b6e28ls5512682edb.2.-pod-prod-gmail; Fri, 17 Mar 2023 06:22:05 -0700 (PDT) X-Received: by 2002:a50:fe99:0:b0:4fb:395a:6aa5 with SMTP id d25-20020a50fe99000000b004fb395a6aa5mr2851657edt.9.1679059325923; Fri, 17 Mar 2023 06:22:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679059325; cv=none; d=google.com; s=arc-20160816; b=WfWXuNVISltI+/xuGa69v+q/0aFAG3d6h/QryD2TQrPbQleeSvyZAnlKKi1QL1egwc PZdi2NpfXkQEoURk3Jm6LwtC8Pp+XsffR+WjlUedK0PmdmHZ4uwAdtrU2VocwzaiSTnd Hhp1CjyNwaRRJ8LY3eXIYyMAgdj9sKTlh/rjNmmEFFXkFhOPPkyoLggFSbJCxdK4xPuZ SQmopjLbO+G81Srl3NMNdeV8Qj+E0/pYxzVpGeU6+1gKWGwgmbU0NXx6aCnB+weKBjWm 7WVYLx6LEv/6vkojotNLOkW7CTU2Xk7cHoS05lPjVbGuLuG80rkmOSHMnVl7Jx0uwMOE +b5w== 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=15nwzJYNf+cSQEA+wQQO5OguwAz1AL3lN0Rkg1QXQRw=; b=lS48Da+KNXROtl1V8KWG6ad4lr4Wp0FqiaE0Ay2qrKmrzei3aBBCq/SQagyfW1xElo rcFCfVGaI/rjR1kx1Y/zv2ncPnOYiz8BivTfEDdqCv1ZW+0+03jpHPeMzwWgOOKuFwaM zLu5FZzROuqKCpubpyfBTH5IpSOPkHrYWsOoSiw79cs5SITxEb2CAQAiVAfphKD5wwhf JL4OPAz+1e3UDI6jIbiufwchq1btvZL8gusSXUcw9Xh8Ejm5dVHXlsorKxVlLda/Bbbo T6+qsLjSwIxNVLGDgWfWxvga72Z1sCcbR8ysdij52HpVcKqh66AA+ELs2NxYFjHoRWs+ PZcA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hnxFVAbT; spf=pass (google.com: domain of fm-72506-20230317132205abf0d3b65e34a09a46-httcwa@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230317132205abf0d3b65e34a09a46-httcwa@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2023 06:22:05 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20230317132205abf0d3b65e34a09a46-httcwa@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20230317132205abf0d3b65e34a09a46 for ; Fri, 17 Mar 2023 14:22:05 +0100 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 6/7] starfive-visionfive2: create u-boot-spl FIT image Date: Fri, 17 Mar 2023 14:21:05 +0100 Message-Id: <20230317132106.1111258-7-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 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=hnxFVAbT; spf=pass (google.com: domain of fm-72506-20230317132205abf0d3b65e34a09a46-httcwa@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-20230317132205abf0d3b65e34a09a46-httcwa@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?= Signed-off-by: Felix Moessbauer --- .../files/rules.tmpl | 12 ++++++ .../files/visionfive2-u-boot-firmware.install | 1 + .../visionfive2-uboot-fit-image.its.tmpl | 41 +++++++++++++++++++ .../visionfive2-u-boot-firmware.bb | 36 ++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl create mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install create mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl create mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl new file mode 100644 index 00000000..4826f7d6 --- /dev/null +++ b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +KERNEL_VERSION=$(shell find /usr/lib/ -maxdepth 1 -type d -name 'linux-image-*' | head -1 | sed 's/.*linux-image-//g') + +override_dh_auto_configure: + sed -i 's||$(KERNEL_VERSION)|g' visionfive2-uboot-fit-image.its + +override_dh_auto_build: + mkimage -A riscv -O u-boot -f ${IMAGE_ITS_FILE} visionfive2_fw_payload.img + +%: + dh $@ diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install new file mode 100644 index 00000000..d1bdf6d6 --- /dev/null +++ b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install @@ -0,0 +1 @@ +visionfive2_fw_payload.img usr/share/visionfive2-u-boot-firmware diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl new file mode 100644 index 00000000..4cbe9318 --- /dev/null +++ b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl @@ -0,0 +1,41 @@ +/dts-v1/; + +/ { + description = "U-boot-spl FIT image for JH7110 VisionFive2"; + #address-cells = <2>; + + images { + firmware { + description = "u-boot"; + data = /incbin/("/usr/lib/opensbi/starfive-visionfive2/fw_payload.bin"); + type = "firmware"; + arch = "riscv"; + os = "u-boot"; + load = <0x0 0x40000000>; + entry = <0x0 0x40000000>; + compression = "none"; + }; + fdt { + description = "DTB"; + data = /incbin/("/usr/lib/linux-image-/${DTB_FILES}"); + type = "flat_dt"; + arch = "riscv"; + compression = "none"; + load = <0x46000000>; + entry = <0x46000000>; + hash { + algo = "sha1"; + }; + }; + }; + + configurations { + default = "config-1"; + + config-1 { + description = "U-boot-spl FIT config for JH7110 VisionFive2"; + firmware = "firmware"; + fdt = "fdt"; + }; + }; +}; diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb new file mode 100644 index 00000000..b2303968 --- /dev/null +++ b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb @@ -0,0 +1,36 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +inherit dpkg + +DESCRIPTION = "StarFive VisionFive 2 u-boot firmware" + +IMAGE_ITS_FILE = "visionfive2-uboot-fit-image.its" +SRC_URI = " \ + file://${IMAGE_ITS_FILE}.tmpl \ + file://rules.tmpl \ + file://visionfive2-u-boot-firmware.install" + +DEPENDS += "opensbi-starfive-visionfive2 linux-image-${KERNEL_NAME}" +DEBIAN_BUILD_DEPENDS += "opensbi-starfive-visionfive2, u-boot-tools, device-tree-compiler, linux-image-${KERNEL_NAME}" + +TEMPLATE_FILES = "${IMAGE_ITS_FILE}.tmpl rules.tmpl" +TEMPLATE_VARS = "IMAGE_ITS_FILE DTB_FILES" + +do_prepare_build[cleandirs] += "${S}/debian" +do_prepare_build(){ + cp ${WORKDIR}/${IMAGE_ITS_FILE} ${S}/ + cp ${WORKDIR}/visionfive2-u-boot-firmware.install ${S}/debian/ + deb_debianize +} + +do_deploy() { + dpkg --fsys-tarfile ${WORKDIR}/visionfive2-u-boot-firmware_${PV}*.deb | \ + tar xOf - "./usr/share/visionfive2-u-boot-firmware/visionfive2_fw_payload.img" \ + > "${DEPLOY_DIR_IMAGE}/visionfive2_fw_payload.img" +} + +addtask deploy after do_dpkg_build before do_build +do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" From patchwork Fri Mar 17 13:21:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 2737 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Mar 2023 14:22:14 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f58.google.com (mail-ed1-f58.google.com [209.85.208.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 32HDMDOD005591 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Mar 2023 14:22:13 +0100 Received: by mail-ed1-f58.google.com with SMTP id fi8-20020a056402550800b004a26cc7f6cbsf7924178edb.4; Fri, 17 Mar 2023 06:22:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1679059328; cv=pass; d=google.com; s=arc-20160816; b=KulN7L7T3+UeLCfp9edybm/h9c4uqIAPqnJCmBXHKyWTVxZUb/IW8inasmPHRlwNDf goWgB4oUWCA+HXgUycvmDfMFn0q4KkY/alhJHikYjA8w7W7b9YRK7G0DKj6rTMFHybXW eGigKkH6+dcdKLo67xLjXV6rjsk6kStW0cnX6essY2mJ80WIEEb/sV981W++t37VL0oQ qj0BkLsxfIKKjNMlqY3Yji4YJIe6seRSMs4RrjpnBm75QeICYYz7qPAeFIE0OwHO50J5 u9psnGAd/w3DYwI7V9J+v97V2JNyHfafqJFzmh2bw0zzqEZ6hfvYepIIfimgMXl56GXX ed3w== 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=AZ8XopGgaeJ+Y1HzxP3dd04OP6FEuxSrW0EgE02qSWM=; b=Tzx/hYkeHB3FDapD4G95W+Q/j+0IS5x0Vos0ClrhhaU1T6cGAmViHCrManDuGXX4Q+ +bOZQtDTAk0fl7q2jXY1wnmHasnQvw3wht2ktk6579D2dXdusyEA3sxs8Ao1j2DvvJSQ ZfcZFqUU71Z9G1wo26MX1dRFrvPBsymXKKOpf+M5HB1kGudZDYO0bQyEzRcGpHHSzq9H RCkUqUYxaqECJzdyL6cvuXWcFaCv0684Hu2UBwsjvJVx6AFPehcFl3NdDl3nrpKqcYI3 c2zuyNG7pPiqOgPrTwE0X8mnvwvagDdTOtvZqPM9OAOABxFdD4QeWlfAKOYvzj5iYyGN nBhA== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; t=1679059328; 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=AZ8XopGgaeJ+Y1HzxP3dd04OP6FEuxSrW0EgE02qSWM=; b=Ef/VPBzO/17l5DYXCw4Se7jRO1oRle8aYKo0rBlSeU0eKQQ8eLfm9i9l23ZrwBTsLg aKP9WpqP1+k0DhgFEzjwsULIz3Jo+3docQeMyKEIL6b/xxLm2Gr5iZw+xio6py/ZzJhf B08PJMZOQ7LqtK0xCvqzr/2XPoRHZyv/9wkjFMYX+EUpAOPaCyFg5iZua9YlBih3/IZb UB6Lf/FCOr76TniMfbjvdPbxPtQHrZShMWp/3B9Hio1SGAKLoet8VuI2bnZDnHZkknDI TfidkHtMYXhC35cClBuV3+9n4wglIG4n5llka2mUn8sZdwXjTu/dTbT9USGHcsFkLbte STgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679059328; 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=AZ8XopGgaeJ+Y1HzxP3dd04OP6FEuxSrW0EgE02qSWM=; b=Ar3qKx8vyOn2LJ/iwNSsxTbhhGM6orsdWXmWSw8/Oqv8Z6aN+BLeYUnJWqsM4YNF+H eNqO2jtoKUDE3ckOM4QAfrpPVZk3bYxlXkA9lBtwYUVKJgeFsDE6Pg1Ss+zBzPjFP97V 601teF548kW6zLEUC78SWDwHCp84moPEzdift946WOrC8J4AsECtTA6S9OXgip1XymT8 AH/WsS5O8ChscbO7OWKQxvxMNSXdym1TMT6Hk7qnlo4k90RW/bzK8gSjuxiSsBk7Xqye pvFUzrT5nki+hMNK4c5mW7yDyqD0OnvDYsHNhRoCxOBWb2tmjxYSyKozQsrF/vZpWxlB 1nlA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AO0yUKXl1DPc0BmK4ILprYKqwYH40NPOg/l94XcB2KOBSVhxdDs3+4Q6 rVs+IvnIF34PkSppKum3MWY= X-Google-Smtp-Source: AK7set/NDOtaT12ew/yhQjVAAKiTHLoBN36IdLwMF8ctijC9zfZq3Zm3m/uWAA8SqCGCWuxATsj+3g== X-Received: by 2002:a17:906:289a:b0:88d:ba79:4317 with SMTP id o26-20020a170906289a00b0088dba794317mr1602122ejd.7.1679059328261; 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-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 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; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20230317132206375fd42d5c47a50e17 for ; Fri, 17 Mar 2023 14:22:06 +0100 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 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=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 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 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"