From patchwork Thu Jul 27 21:18:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 52274 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0D99127BBE9; Thu, 27 Jul 2023 22:42:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 42BA127BBE2 for ; Thu, 27 Jul 2023 22:42:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qP8P1-00065p-1m; Thu, 27 Jul 2023 17:20:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qP8Ow-00065J-Vu for guix-patches@gnu.org; Thu, 27 Jul 2023 17:20:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qP8Ow-00036Q-Km; Thu, 27 Jul 2023 17:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qP8Ow-0000T9-3U; Thu, 27 Jul 2023 17:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64907] [PATCH 2/2] gnu: Add opensbi-rvvm. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, ludo@gnu.org, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 27 Jul 2023 21:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64907 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64907@debbugs.gnu.org Cc: Juliana Sims , Efraim Flashner , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian Received: via spool by 64907-submit@debbugs.gnu.org id=B64907.16904927751754 (code B ref 64907); Thu, 27 Jul 2023 21:20:02 +0000 Received: (at 64907) by debbugs.gnu.org; 27 Jul 2023 21:19:35 +0000 Received: from localhost ([127.0.0.1]:43245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qP8OU-0000SE-Rm for submit@debbugs.gnu.org; Thu, 27 Jul 2023 17:19:35 -0400 Received: from relay5-d.mail.gandi.net ([2001:4b98:dc4:8::225]:36279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qP8OQ-0000Rl-SF for 64907@debbugs.gnu.org; Thu, 27 Jul 2023 17:19:32 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id BCE721C0008; Thu, 27 Jul 2023 21:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1690492763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=60Gv3XcKswr6RuMQA1dQSP6cAcRlw4n5lVEqnWNONHg=; b=DYzeE/dEFi0oj4y1DM5sYVnmTTacexRQAYL58D4FgNA5lZ5sTdGLrD8/jf2fywH0PU2JiF wr3kVfWL4RSV/IlkOfVVxT/5zuoGIAXNHA4Gp7yH9D1Knozp6JfT1spkBCHM6g9LR+0+Sf U5fULlMohWq4+2p9Ljn8QVmgMglXp47W9CuUfn7GmhB8O8fp+3AsFLWFrlC3og9ZlEjijv 4nqTtBZFHXGa77lxESSJnh4G//U5EFV+k4QrNf0GWazfjEK63YzTmdRvQoc6psHUb/OCCY skURcQmqI2JuFwE9pZnVv6yNmmba1MTbYI1t1SqoBlyGnPhHcK+5xVkqtT+Zzg== From: Juliana Sims Date: Thu, 27 Jul 2023 17:18:58 -0400 Message-ID: <2502f76902b6983a62cb81e36959982ae7cdfe47.1690488628.git.juli@incana.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-GND-Sasl: juli@incana.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/firmware.scm (opensbi-rvvm): New symbol. * gnu/packages/patches/opensbi-rvvm-lowram-fdt.patch: New patch. --- gnu/packages/firmware.scm | 32 +++++++++++++++++++ .../patches/opensbi-rvvm-lowram-fdt.patch | 21 ++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 gnu/packages/patches/opensbi-rvvm-lowram-fdt.patch diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index ff5afbcbe1..728050b43a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020, 2021, 2022 Marius Bakke ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2023 Juliana Sims ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu packages firmware) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages bootloaders) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -567,6 +569,36 @@ (define-public opensbi-qemu (description "This package contains OpenSBI firmware files for use with QEMU."))) +(define-public opensbi-rvvm + (let ((base opensbi-generic)) + (package + (inherit base) + (name "opensbi-rvvm") + (source (origin + (inherit (package-source base)) + (patches (cons + ;; Allows opensbi to work on systems with <32M of RAM + ;; https://github.com/LekKit/patches-misc/blob/cc40906fbf1de9ae466304157f2bf7b8cc909cbe/opensbi/opensbi_lowram_fdt.patch + (search-patch "opensbi-rvvm-lowram-fdt.patch") + (origin-patches (package-source base)))))) + + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:make-flags flags) + #~(cons (string-append "FW_PAYLOAD_PATH=" + #$(file-append u-boot-rvvm + "/libexec/u-boot.bin")) + (delete "FW_PAYLOAD=n" + #$flags))))) + (inputs (cons u-boot-rvvm + (package-inputs base))) + (description (string-append (package-description base) + " + +This package contains OpenSBI firmware files for use with +@code{rvvm}. In particular, it adds support for low-RAM systems and builds a +@code{fw_payload.bin} file using @code{u-boot-rvvm-riscv64}."))))) + (define-public seabios (package (name "seabios") diff --git a/gnu/packages/patches/opensbi-rvvm-lowram-fdt.patch b/gnu/packages/patches/opensbi-rvvm-lowram-fdt.patch new file mode 100644 index 0000000000..c9e27020f0 --- /dev/null +++ b/gnu/packages/patches/opensbi-rvvm-lowram-fdt.patch @@ -0,0 +1,21 @@ +Authored-by: LekKit + +Allows OpenSBI to work on devices with <32M of RAM, +by moving FDT into page alignment zone before the kernel. +This also allows running kernels that are >32M in size. + +Applies cleanly onto OpenSBI 1.2 + +diff --git a/platform/generic/objects.mk b/platform/generic/objects.mk +index 136853e..104a063 100644 +--- a/platform/generic/objects.mk ++++ b/platform/generic/objects.mk +@@ -32,7 +32,7 @@ else + # This needs to be 2MB aligned for 64-bit system + FW_JUMP_ADDR=$(shell printf "0x%X" $$(($(FW_TEXT_START) + 0x200000))) + endif +-FW_JUMP_FDT_ADDR=$(shell printf "0x%X" $$(($(FW_TEXT_START) + 0x2200000))) ++FW_JUMP_FDT_ADDR=$(shell printf "0x%X" $$(($(FW_TEXT_START) + 0x100000))) + FW_PAYLOAD=y + ifeq ($(PLATFORM_RISCV_XLEN), 32) + # This needs to be 4MB aligned for 32-bit system