From patchwork Fri Mar 3 12:48:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 13158766 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5893EC7EE30 for ; Fri, 3 Mar 2023 13:12:36 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web10.21953.1677847720606522388 for ; Fri, 03 Mar 2023 04:48:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=felix.moessbauer@siemens.com header.s=fm1 header.b=U3scz4cB; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-72506-20230303124844ce5fb99706c0dfc0c7-fy2vxe@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20230303124844ce5fb99706c0dfc0c7 for ; Fri, 03 Mar 2023 13:48:44 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=upKed2U3no8AR0DzZU+PVcqh8pShiAeTurXE57Rfag0=; b=U3scz4cBTRdpU9IXSjX9hJNEklVCWmA1P63lYTrwiNjunw6TZkwXFscWica5LG2vojdCq5 mJRRp/cHQORHRP4W5UXflT1BAazegFaFzjQuw3Z1nLb7kkze5ackCtZx5EkXuMrRkaK73MzE GNLQhdhn+hVXCcknQgb8akuy6zL0U=; From: Felix Moessbauer To: cip-dev@lists.cip-project.org Cc: daniel.bovensiepen@siemens.com, jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [isar-cip-core][PATCH v4 2/8] fix efibootguard for riscv64 Date: Fri, 3 Mar 2023 12:48:14 +0000 Message-Id: <20230303124820.2209954-3-felix.moessbauer@siemens.com> In-Reply-To: <20230303124820.2209954-1-felix.moessbauer@siemens.com> References: <20230303124820.2209954-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Mar 2023 13:12:36 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/10907 This commit backports an upstream patch for efibootguard that fixes the riscv64 install location. As it is not yet in an EBG release, we add it as a patch here. No internal logic of EBG is changed, hence no dedicated release is needed. Signed-off-by: Felix Moessbauer --- recipes-bsp/efibootguard/efibootguard_0.13.bb | 3 ++ ...01-add-machine-type-name-for-riscv64.patch | 39 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch diff --git a/recipes-bsp/efibootguard/efibootguard_0.13.bb b/recipes-bsp/efibootguard/efibootguard_0.13.bb index 3279854..dd76198 100644 --- a/recipes-bsp/efibootguard/efibootguard_0.13.bb +++ b/recipes-bsp/efibootguard/efibootguard_0.13.bb @@ -21,6 +21,9 @@ SRC_URI = " \ file://debian \ " SRC_URI[sha256sum] = "639a6d8f687cb099b2e9b01eb08ad1494267fe26b5d903b4d405d0737feb989b" +# add riscv64 support +SRC_URI += "file://0001-add-machine-type-name-for-riscv64.patch" +CHANGELOG_V = "${PV}+cip" PROVIDES = "${PN}" PROVIDES += "${PN}-dev" diff --git a/recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch b/recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch new file mode 100644 index 0000000..adc7962 --- /dev/null +++ b/recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch @@ -0,0 +1,39 @@ +From 391dd5e04b17be6f5184afb2de4853795f1d5620 Mon Sep 17 00:00:00 2001 +From: Felix Moessbauer +Date: Tue, 31 Jan 2023 09:27:31 +0100 +Subject: [PATCH 1/1] add machine type name for riscv64 + +By adding the machine type name, the generated efi binary for +riscv64 is suffixed with the corresponding efi machine name. + +Signed-off-by: Felix Moessbauer +Signed-off-by: Jan Kiszka +--- + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure.ac b/configure.ac +index d8f9d3a..90d70b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -87,6 +87,7 @@ SET_ARCH(X86_64, x86_64*) + SET_ARCH(IA64, ia64*) + SET_ARCH(AARCH64, aarch64*) + SET_ARCH(ARM, arm*) ++SET_ARCH(RISCV64, riscv64*) + + ARCH=$(echo $host | sed "s/\(-\).*$//") + +@@ -103,6 +104,9 @@ AM_COND_IF(ARCH_AARCH64, [ + AM_COND_IF(ARCH_ARM, [ + MACHINE_TYPE_NAME=arm]) + ++AM_COND_IF(ARCH_RISCV64, [ ++ MACHINE_TYPE_NAME=riscv64]) ++ + AC_SUBST([ARCH]) + AC_SUBST([MACHINE_TYPE_NAME]) + AM_CONDITIONAL([ARCH_IS_X86], [test "$ARCH" = "ia32" -o "$ARCH" = "x86_64"]) +-- +2.30.2 +