From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qDy0JSHt82SDOQAAauVa8A:P1 (envelope-from ) for ; Sun, 03 Sep 2023 04:19:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id qDy0JSHt82SDOQAAauVa8A (envelope-from ) for ; Sun, 03 Sep 2023 04:19:13 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E5E0B3A77B for ; Sun, 3 Sep 2023 04:19:12 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=SPaPHjqB; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693707553; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=RLKNdFjr7FfWIUk7hUORoeTW8lGdkXWCn5z4ztXw248=; b=EZsuq2eOPKAbu2eu2l2qi06FPKM/e2bIBHGCFFshw+xTSBsKaCsFG7djWfIe3xOxiGKnbn Szfv2faiHYwXy/2OxwdbMR4kcWVfoznGoD0Y1y9SZ2hoXO9KBmu8aNBVYIbbkAM70eABoq 9+2GyQnOc7LITkMdzMy1d0zIZmlAjVA4zP9NnUMr/3/xYXj6J73072hy6QQTmH48xN4qxN jd9K5t9XEFO2P8JPhtC3mfLs9qsfIlB1rEPA3sCpVZ3V9lQmINT1TYXzWePmJOVEl4Ipaj whXSTO9FQ59B6sdM4VMBtqTQhXYc5sZj2MKxfJJ/2exhkAwqGcJOLhEE50AQfg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=SPaPHjqB; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693707553; a=rsa-sha256; cv=none; b=b+QNC1Q3eqJuvdw6VRuejf4Fn5jLTF1WfCnUaoBw2jhXtoB2xeiNLjcDS4SYApBfJa+r0g 9n5qGLSIdtnCRx97xHS5cR2FvPuxOwtdmIzdlFfXjUGL7d3IApg77wd1ZvXYi9qF4sRUNY TIcD9DQDCMeYYpMwKtuHJKuWrNsrCl8uX7N5in576/V+6tU575VZ+lIgRX53LgKgKCtO/w 3WH350m7whHbXZTsKrJ9GjAxNb1bdHvSHyjOfKBxrHEY0nhznZooDzum+bcxB+MTiIe1A3 wCUtC2RWweIDwC9xC6+5X7ueHIk+oJI4CaFgkmJhEWg9sT751BNp7wL6e8dACw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcchT-0006CV-JP; Sat, 02 Sep 2023 22:18:55 -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 1qcchQ-0006CK-QE for guix-patches@gnu.org; Sat, 02 Sep 2023 22:18:52 -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 1qcchQ-00050X-Hz for guix-patches@gnu.org; Sat, 02 Sep 2023 22:18:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qccha-0001LI-4s for guix-patches@gnu.org; Sat, 02 Sep 2023 22:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64907] [PATCH 1/2] gnu: Add u-boot-rvvm. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Sep 2023 02:19: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: Juliana Sims , 64907@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Efraim Flashner Received: via spool by 64907-submit@debbugs.gnu.org id=B64907.16937074955105 (code B ref 64907); Sun, 03 Sep 2023 02:19:02 +0000 Received: (at 64907) by debbugs.gnu.org; 3 Sep 2023 02:18:15 +0000 Received: from localhost ([127.0.0.1]:38973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qccgo-0001KG-Ql for submit@debbugs.gnu.org; Sat, 02 Sep 2023 22:18:15 -0400 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]:56336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qccgk-0001K1-QK for 64907@debbugs.gnu.org; Sat, 02 Sep 2023 22:18:13 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id C17581AAD1; Sat, 2 Sep 2023 19:17:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1693707471; bh=StcSp5X6ujs0OVcJqpGbvp+8pH1ISc72C8zFRZUF+2M=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=SPaPHjqBVy4nPoM8dGGHjy34c58aKgB+zMYcLoDgWEu2jsqzXAtQArZ7VxXwCyuV3 zk7ZixJoexI6Bs6Zj+yrCqG5fnXMTZd5tXt8WzraqmF2DyfzcsDO4gaLRlzZk8pZM3 6Lj/QWWuwl83zge2sWltmvCMfXvWkzxshYFUcfyx9UZe7YQ1U50U543KpneciuQ0Ek yWY9zD0L0zrHmGAe8xGxaoYIK0buxIFNFAvj15lub3ncs8j9sWGkNXf3y/OarW+lAc qCv/WFyRZb4wLR5/fI2u+MRcyyC5kZUHeEExDsPMa5KPBzKa7OPIm4fnWKtppCz+Z5 32fBeZ9NIainQ== From: Vagrant Cascadian In-Reply-To: <62cefdc5d6a4b0e3d6e611a6b6541f00acc19d9f.1690488628.git.juli@incana.org> References: <62cefdc5d6a4b0e3d6e611a6b6541f00acc19d9f.1690488628.git.juli@incana.org> Date: Sat, 02 Sep 2023 19:17:47 -0700 Message-ID: <87r0ngm244.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: E5E0B3A77B X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: -1.83 X-Spam-Score: -1.83 X-TUID: Geja4ZoslOZU --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2023-07-27, Juliana Sims wrote: > * gnu/packages/bootloaders.scm (%u-boot-rvvm-support-patch, u-boot-rvvm):= New > symbol. > * gnu/packages/patches/u-boot-rvvm-support.patch: New patch. ... > diff --git a/gnu/packages/patches/u-boot-rvvm-support.patch b/gnu/package= s/patches/u-boot-rvvm-support.patch > new file mode 100644 > index 0000000000..1e62a2d61d > --- /dev/null > +++ b/gnu/packages/patches/u-boot-rvvm-support.patch > @@ -0,0 +1,67 @@ > +Patch to support NVMe and RVVM board properly in U-Boot > + - Enables NVMe PCI support & booting from it > + - Enables framebuffer driver, passes it as EFI FB > + - Enables Realtek RTL8169 driver > + - Get rid of DHCP boot, it is confusing and not helpful > + > +Applies cleanly over U-Boot 2023.4 > +Reuses QEMU virt board config, build like this: > + make qemu-riscv64_smode_defconfig > + CROSS_COMPILE=3Driscv64-linux-gnu- make > + > +Resulting firmware works fine on both RVVM and QEMU > + > +diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > +index 48ca4ff4..faa17f33 100644 > +--- a/arch/riscv/Kconfig > ++++ b/arch/riscv/Kconfig > +@@ -15,7 +15,7 @@ config TARGET_MICROCHIP_ICICLE > + bool "Support Microchip PolarFire-SoC Icicle Board" > +=20 > + config TARGET_QEMU_VIRT > +- bool "Support QEMU Virt Board" > ++ bool "Support QEMU/RVVM Virt Boards" > +=20 > + config TARGET_SIFIVE_UNLEASHED > + bool "Support SiFive Unleashed Board" This seems unecessary, unless this is pulling from a patch submitted to upstream u-boot that is likely to be merged. > +diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-r= iscv/Kconfig > +index 6114e1b8..7c25825a 100644 > +--- a/board/emulation/qemu-riscv/Kconfig > ++++ b/board/emulation/qemu-riscv/Kconfig > +@@ -29,6 +29,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy > + def_bool y > + select GENERIC_RISCV > + select SUPPORT_SPL > ++ imply OPTIMIZE_INLINING > + imply AHCI > + imply SMP > + imply BOARD_LATE_INIT > +@@ -50,7 +51,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy > + imply SCSI_AHCI > + imply AHCI_PCI > + imply E1000 > ++ imply RTL8169 > + imply NVME > ++ imply NVME_PCI > ++ imply VIDEO > ++ imply VIDEO_SIMPLE > ++ imply NO_FB_CLEAR > + imply PCI > + imply PCIE_ECAM_GENERIC > + imply SCSI I *think* all of these options could be done by passing #:configs ... For example, how the u-boot-qemu-arm changes an option: (define-public u-boot-qemu-arm (make-u-boot-package "qemu_arm" "arm-linux-gnueabihf" #:configs '("# CONFIG_FIT_SIGNATURE is not set"))) > +diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h > +index 20135f56..821251a3 100644 > +--- a/include/configs/qemu-riscv.h > ++++ b/include/configs/qemu-riscv.h > +@@ -19,9 +19,9 @@ > +=20 > + #define BOOT_TARGET_DEVICES(func) \ > + func(QEMU, qemu, na) \ > ++ func(NVME, nvme, 0) \ > + func(VIRTIO, virtio, 0) \ > +- func(SCSI, scsi, 0) \ > +- func(DHCP, dhcp, na) > ++ func(SCSI, scsi, 0) > +=20 > + #include > +=20 > --=20 > 2.41.0 I would just leave the DHCP in; it surely cannot hurt *that* much... or? ... at which point, if all my other suggestions are accepted, the NVME part might be the only patch to upstream sources, and you could fix it with a snippet or phase or a one-line patch. :) live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZPPsywAKCRDcUY/If5cW qm+5AQD8XdH/XvDvjQ8t1ydsMADxOVMQHXrr+F8oEDQ5FRnZhwEA8+I4F/8zFqbC BmN0KQ74hs7djE370ZJGITgWtaZWpwY= =m0YE -----END PGP SIGNATURE----- --=-=-=--