From unknown Sun Jun 22 13:38:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53791] [PATCH] Revert kernel modules changes to support the Coreboot framebuffer Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Feb 2022 23:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53791 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53791@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164401877729473 (code B ref -1); Fri, 04 Feb 2022 23:53:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2022 23:52:57 +0000 Received: from localhost ([127.0.0.1]:33209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG8Ns-0007fI-HZ for submit@debbugs.gnu.org; Fri, 04 Feb 2022 18:52:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:49844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG8Nr-0007fB-Dq for submit@debbugs.gnu.org; Fri, 04 Feb 2022 18:52:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG8Nq-00066T-OA for guix-patches@gnu.org; Fri, 04 Feb 2022 18:52:54 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:48691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG8NN-0003AD-8c for guix-patches@gnu.org; Fri, 04 Feb 2022 18:52:27 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id DD1843202053; Fri, 4 Feb 2022 18:52:23 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 04 Feb 2022 18:52:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=mesmtp; bh=OL1Zd1tEgzxUMoZnPcJ9ag+JxKhE2cVRdYZWGd/HZ44=; b=qG JrTw78yBDOWqSbmXHfw8YfKFYGPvtBPH6uVSk1UramgSOCax4/aboGP3rZTvqsca yu/NiN5IbvlEplMoZeAEDIPLNfS8qGg+6FMgee3UXa4R+kk1bOsbRHMIbuMG2leK k6GqkRoDkoZp0fbZcAmN7M1HstdkxSXHvJt2a5pBA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=OL1Zd1tEgzxUMoZnPcJ9ag+JxKhE2 cVRdYZWGd/HZ44=; b=XIDIudcEyWiE1pbHRbOLCmpW36NG/K1k4aFNPSbawAMOl AYDhSR7wbdsG49k7VWawLCiAVCBWhAeAnDLuKJY5LvKAJu9RRmz72hIeCdqI06jM IRcMwfKLV4FdIFhpCvaTqx6cj8gMZSSZxoHEoxnkkBz0dM8GXy1FZGoQjlJDlCQo GLk9CU9Mg3iU4Fm1ewDwBNcfeMuAwc32AxW4GGrDTiiUArNiRO1ErRK/x92ZXPa2 AR6mVuIx9NoKtf8sw0bQZXZJRha3VQN7SbYnswRnD1UlWHa1DnpIJK1sDqUMNM5D kRQ9nHZy+k2T8it/bq7tOw+XyJwQtivY7almD28EA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrhedtgdduhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdr nhgrmhgvqeenucggtffrrghtthgvrhhnpeetueeigfelheekveffveetffeugeeuuddvge eiffevkeeuffefteduvdfhhfduhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 4 Feb 2022 18:52:23 -0500 (EST) From: Leo Famulari Date: Fri, 4 Feb 2022 18:52:20 -0500 Message-Id: <8dbecea6bb418fcfc80d7ffca12e852b71f73c4b.1644018740.git.leo@famulari.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.24; envelope-from=leo@famulari.name; helo=wout1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) These changes broke the creation of the 'linux-modules-database' for all kernel series besides 5.15, 5.4, and 5.10, like this: ------ gnu/build/linux-modules.scm:257:5: kernel module not found "framebuffer_coreboot" "/gnu/store/yff45fr6q93mw44zdql9ffr95zcvwxcn-linux-libre-4.9.299/lib/modules" ------ We should support the coreboot framebuffer, but we need to test that change more completely before deploying it. This effectively reverts the following commits: 1dfe8c372163d481ebebb97dd3b4cafa49906b28 "gnu: linux-libre: Build simplefb into all x86{,_64} kernels." bc09e7ab569d5306ce99c5525150695c9d539ef0 "gnu: linux-libre: Support the Coreboot framebuffer." --- gnu/packages/aux-files/linux-libre/4.14-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.14-x86_64.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.19-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.19-x86_64.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.4-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.4-x86_64.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/5.10-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/5.10-x86_64.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/5.15-i686.conf | 12 +++--------- gnu/packages/aux-files/linux-libre/5.15-x86_64.conf | 12 +++--------- gnu/packages/aux-files/linux-libre/5.4-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 10 ++-------- gnu/system/linux-initrd.scm | 3 +-- 13 files changed, 27 insertions(+), 100 deletions(-) diff --git a/gnu/packages/aux-files/linux-libre/4.14-i686.conf b/gnu/packages/aux-files/linux-libre/4.14-i686.conf index b7a07b5fe3..16a7817115 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-i686.conf @@ -938,7 +938,7 @@ CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_RXS_GEN3=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations @@ -8495,13 +8495,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf index db11c2f6e8..74b1f2cc18 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf @@ -928,7 +928,7 @@ CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_RXS_GEN3=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations @@ -8332,13 +8332,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.19-i686.conf b/gnu/packages/aux-files/linux-libre/4.19-i686.conf index 5deee8206d..0e6637325d 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-i686.conf @@ -713,7 +713,7 @@ CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_RXS_GEN3=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Binary Emulations @@ -737,13 +737,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf index b76fdc9148..36636ebb8d 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf @@ -684,7 +684,7 @@ CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_RXS_GEN3=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Binary Emulations @@ -714,13 +714,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.4-i686.conf b/gnu/packages/aux-files/linux-libre/4.4-i686.conf index 03aef7abfc..32442eb55a 100644 --- a/gnu/packages/aux-files/linux-libre/4.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.4-i686.conf @@ -825,7 +825,7 @@ CONFIG_RAPIDIO_TSI57X=m CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations @@ -7679,13 +7679,7 @@ CONFIG_DMI_SYSFS=m CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf index 0c7852ba48..adfb848f5b 100644 --- a/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf @@ -795,7 +795,7 @@ CONFIG_RAPIDIO_TSI57X=m CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations @@ -7461,13 +7461,7 @@ CONFIG_DMI_SYSFS=m CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/5.10-i686.conf b/gnu/packages/aux-files/linux-libre/5.10-i686.conf index d24bbbcaa2..cb1fdc37ad 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-i686.conf @@ -650,7 +650,7 @@ CONFIG_ALIX=y CONFIG_NET5501=y CONFIG_GEOS=y CONFIG_AMD_NB=y -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # end of Bus options (PCI etc.) # @@ -674,13 +674,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf index 3a905e6286..cd61860af9 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf @@ -643,7 +643,7 @@ CONFIG_MMCONF_FAM10H=y # CONFIG_ISA_BUS is not set CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # end of Bus options (PCI etc.) # @@ -670,13 +670,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/5.15-i686.conf b/gnu/packages/aux-files/linux-libre/5.15-i686.conf index 85bd4d0ee1..3c450f624d 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-i686.conf @@ -2249,14 +2249,8 @@ CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=m -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_SYSFB_SIMPLEFB is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support @@ -6731,7 +6725,7 @@ CONFIG_FB_MB862XX=m CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_I2C=y CONFIG_FB_HYPERV=m -CONFIG_FB_SIMPLE=y +CONFIG_FB_SIMPLE=m CONFIG_FB_SSD1307=m CONFIG_FB_SM712=m # end of Frame buffer Devices diff --git a/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf index ad42192937..ef0f220c80 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf @@ -2282,14 +2282,8 @@ CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=m -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_SYSFB_SIMPLEFB is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support @@ -6688,7 +6682,7 @@ CONFIG_FB_MB862XX=m CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_I2C=y CONFIG_FB_HYPERV=m -CONFIG_FB_SIMPLE=y +CONFIG_FB_SIMPLE=m CONFIG_FB_SSD1307=m CONFIG_FB_SM712=m # end of Frame buffer Devices diff --git a/gnu/packages/aux-files/linux-libre/5.4-i686.conf b/gnu/packages/aux-files/linux-libre/5.4-i686.conf index 4c4f258dcd..4e2d7795c7 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-i686.conf @@ -648,7 +648,7 @@ CONFIG_ALIX=y CONFIG_NET5501=y CONFIG_GEOS=y CONFIG_AMD_NB=y -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # end of Bus options (PCI etc.) # @@ -672,13 +672,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf index ec8609171e..5815caa770 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf @@ -632,7 +632,7 @@ CONFIG_MMCONF_FAM10H=y # CONFIG_ISA_BUS is not set CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # end of Bus options (PCI etc.) # @@ -659,13 +659,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index c78dd09205..329cd38cd6 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -352,8 +352,7 @@ (define virtio-modules "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions "nls_iso8859-1" ;for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" system) - '("framebuffer_coreboot" ;for display during early (Core)boot - "pata_acpi" "pata_atiixp" ;for ATA controllers + '("pata_acpi" "pata_atiixp" ;for ATA controllers "isci") ;for SAS controllers like Intel C602 '()) -- 2.34.0 From unknown Sun Jun 22 13:38:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53791] [PATCH] Revert kernel modules changes to support the Coreboot framebuffer References: <8dbecea6bb418fcfc80d7ffca12e852b71f73c4b.1644018740.git.leo@famulari.name> In-Reply-To: <8dbecea6bb418fcfc80d7ffca12e852b71f73c4b.1644018740.git.leo@famulari.name> Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Feb 2022 00:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53791 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53791@debbugs.gnu.org Received: via spool by 53791-submit@debbugs.gnu.org id=B53791.164401951530859 (code B ref 53791); Sat, 05 Feb 2022 00:06:02 +0000 Received: (at 53791) by debbugs.gnu.org; 5 Feb 2022 00:05:15 +0000 Received: from localhost ([127.0.0.1]:33235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG8Zn-00081d-0r for submit@debbugs.gnu.org; Fri, 04 Feb 2022 19:05:15 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:36403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG8Zl-00081N-66 for 53791@debbugs.gnu.org; Fri, 04 Feb 2022 19:05:13 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 5DB3D3201FDA; Fri, 4 Feb 2022 19:05:07 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Fri, 04 Feb 2022 19:05:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:date:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to; s=mesmtp; bh=SxKjjSimvUVFuUWbY4D68DuOWjv3KzWYIUN2BGj29R0=; b=LOQdT380Mw2B wwroL7qqW+QSwhhlxAGcypmuHSdzFvugvpOz/WDTSerZCU+RTC8QplIYV6Jrfel0 yUbFzSiWaTKp01Y2YL3qvDRdLJL063EC+jK0KSGaHVapTzm0eV5AeW6QFT/Df2Qk WzumnfZV8Kv27/NvaPHP6v5tYFLbSDI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=SxKjjSimvUVFuUWbY4D68DuOWjv3KzWYIUN2BGj29 R0=; b=cDrNoyvfgQnHRh+MZzl05q3cgEV/8yXDuGE3OPhax1lJ0kWtSQuDG6Hva AlYTvSeqFStrbPpfb5xWM0BNHsyneHGYsB0jB/0GXEoLxhVAoHMAm3v8i1OCmadP NAWYEC1PuhjOzHzNYZ1DQ5qxfXtUrPZlZiIQfZbaZY29kBIm9Gpr0D8U33B718Xs c7EauYpMrSOQAbHcCOFp7YWWH8DZ0JvFrJRksh6kOsFWS6tO4ZleuZkK1fRPxEHY NLZshJUvDX4btGcPMt1q6Am28x5rGahDJb2hQokLrU6vUGauROl+ZgEdpGybNzDu xFSIbS3AIejfK0PQEiYZCjVUOGGVQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrhedtgddukecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfggtggusehttdertddttd dvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdr nhgrmhgvqeenucggtffrrghtthgvrhhnpeeuieduieejudffvdfhjedvgedvhefggfejvd evkeeffeelfeekueeijeduveetudenucffohhmrghinhepghhnuhdrohhrghenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuh hlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <53791@debbugs.gnu.org>; Fri, 4 Feb 2022 19:05:06 -0500 (EST) Date: Fri, 4 Feb 2022 19:05:04 -0500 From: Leo Famulari Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Original patch submission and discussion: https://issues.guix.gnu.org/51619 Reports of regressions that resulted: https://issues.guix.gnu.org/52667 https://issues.guix.gnu.org/53554 https://issues.guix.gnu.org/53356#0-lineno7 To summarize, the 4.4, 4.9, 4.14, 4.19, and 5.16 kernels cannot be used on Guix without the user creating a custom initrd-modules in their operating-system declaration. default-initrd-modules should "just work" with all the kernel series offered by Guix. Anyways, it's been a while since the regressions were introduced, and still no solution. So I propose that we revert the changes that introduced the regression, for now. From unknown Sun Jun 22 13:38:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53791] [PATCH] Revert kernel modules changes to support the Coreboot framebuffer Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Feb 2022 04:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53791 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 53791@debbugs.gnu.org Received: via spool by 53791-submit@debbugs.gnu.org id=B53791.16441227405071 (code B ref 53791); Sun, 06 Feb 2022 04:46:01 +0000 Received: (at 53791) by debbugs.gnu.org; 6 Feb 2022 04:45:40 +0000 Received: from localhost ([127.0.0.1]:36142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGZQi-0001Ji-92 for submit@debbugs.gnu.org; Sat, 05 Feb 2022 23:45:40 -0500 Received: from mail-qk1-f174.google.com ([209.85.222.174]:37801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGZQg-0001JU-5P for 53791@debbugs.gnu.org; Sat, 05 Feb 2022 23:45:39 -0500 Received: by mail-qk1-f174.google.com with SMTP id 71so8336276qkf.4 for <53791@debbugs.gnu.org>; Sat, 05 Feb 2022 20:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=UBHLiPgK3uVinp0/20OPsotNz/pSim1CZOYJ1top55c=; b=Kkl9jdWXv+8oKV1GpjOmoo2yTHW17rvOLnLasX2w/3cADiFAcCit0f2NUYMxWk1xVJ LIWb0M7l3cnL+w++9I36C5VQOp14TyMOrlABmDPoStKajL+zJf1jHI1i14OwQXS+e9Zc qYMA7DUZ9BaS8CNdBPe3q8/WcEM9QQCmzqtf8gTh3jspNzLMWr7auycWdztvswqSR2KJ BxfDNTMRkJJuwkOp8V4+sm/7Wy7LaAp6g16xyRpmel98/PbVgNvMuI+jOTfARl+B0diS dN2YFEajdt+yn//X2lQgC3Lg2MJ64Dg3vuQhHy+RWKCzLeEPzEiJA9IrvcxB7Ayd4Md6 ghog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=UBHLiPgK3uVinp0/20OPsotNz/pSim1CZOYJ1top55c=; b=eaLaP+AHV8xXmbfaM6BeIazEf9m4/d0QiSLwEnH6V6zzA39T09ithJ+LLLq2iC3o5B XFKfrUG1/92/nVT0u60fQuMS+AJl0FCuYqKoTvJPfD5Z6+gdh9y/tAJrVRuFiUU4tMvK 6Om+KP5Jaya17VCwB9sSnM6FG04UM1QjTeOIjHUGB9JZ+1E7b97KtB6X8kv7cCUfGYcp usL9HKBG67f6aZPfwJJ71YxNRSx18L339atNl2+/UfGYYzcOJEiRrkDlEW36DKafx344 d4eW5qPgMkRx/YshTMurC3WrJG8hBOPHXw7DF4JXVxmbFyDh9uP4dHTOYJhEg0vxW3GJ XPDQ== X-Gm-Message-State: AOAM531Aa8NOZ6JBT9/6Ugpqz22PoiFRj3qUxKenWtDz+FYfyJtUr3hP LVS7tCMCjFaNGaRywySz+CEVldrpHCk= X-Google-Smtp-Source: ABdhPJwb8HevKZTCtmyZav9uE0eYhYXiE18MHIAQG9fpsywgYAJ4nmLSVJ3dMj2mGZm+61zDqEcU4A== X-Received: by 2002:a05:620a:2996:: with SMTP id r22mr3420917qkp.550.1644122732525; Sat, 05 Feb 2022 20:45:32 -0800 (PST) Received: from hurd (dsl-10-149-121.b2b2c.ca. [72.10.149.121]) by smtp.gmail.com with ESMTPSA id r7sm3623136qkp.82.2022.02.05.20.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Feb 2022 20:45:32 -0800 (PST) From: Maxim Cournoyer References: <8dbecea6bb418fcfc80d7ffca12e852b71f73c4b.1644018740.git.leo@famulari.name> Date: Sat, 05 Feb 2022 23:45:31 -0500 In-Reply-To: (Leo Famulari's message of "Fri, 4 Feb 2022 19:05:04 -0500") Message-ID: <87bkzk38no.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Leo, Leo Famulari writes: > Original patch submission and discussion: > > https://issues.guix.gnu.org/51619 > > Reports of regressions that resulted: > > https://issues.guix.gnu.org/52667 > https://issues.guix.gnu.org/53554 > https://issues.guix.gnu.org/53356#0-lineno7 > > To summarize, the 4.4, 4.9, 4.14, 4.19, and 5.16 kernels cannot be used > on Guix without the user creating a custom initrd-modules in their > operating-system declaration. > > default-initrd-modules should "just work" with all the kernel series > offered by Guix. > > Anyways, it's been a while since the regressions were introduced, and > still no solution. So I propose that we revert the changes that > introduced the regression, for now. Sounds reasonable to me. Thanks, Maxim From unknown Sun Jun 22 13:38:36 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Leo Famulari Subject: bug#53791: closed (Re: bug#53791: [PATCH] Revert kernel modules changes to support the Coreboot framebuffer) Message-ID: References: <8dbecea6bb418fcfc80d7ffca12e852b71f73c4b.1644018740.git.leo@famulari.name> X-Gnu-PR-Message: they-closed 53791 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 53791@debbugs.gnu.org Date: Wed, 09 Feb 2022 16:37:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1644424622-2536-1" This is a multi-part message in MIME format... ------------=_1644424622-2536-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #53791: [PATCH] Revert kernel modules changes to support the Coreboot frame= buffer which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 53791@debbugs.gnu.org. --=20 53791: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D53791 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1644424622-2536-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 53791-done) by debbugs.gnu.org; 9 Feb 2022 16:36:43 +0000 Received: from localhost ([127.0.0.1]:52441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHpxS-0000eB-UI for submit@debbugs.gnu.org; Wed, 09 Feb 2022 11:36:43 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:35551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHpxQ-0000dt-8E for 53791-done@debbugs.gnu.org; Wed, 09 Feb 2022 11:36:41 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 113343200A47; Wed, 9 Feb 2022 11:36:33 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 09 Feb 2022 11:36:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=mesmtp; bh=E1KL1c0vFMV+5I0T3aNhFLYAYUk bP2Lq817N3hdk1Yw=; b=mn2Wwvi5uYhaQ/FMWTYQj1xXwnLAW5ipBCI9a37V9fI 7KGVeV0ZAWoma2+hu9W6sPC32AsqLKMyoRyaOsSX1Oh+2AXeQX0zhinUZJdocu34 gyfOm1A4h7xH24sxwSKaoiAzcQn25VSj8Y1Johz8sO1Q0E+/xmb2Y/2dVx1YNWlU = DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=E1KL1c0vFMV+5I0T3 aNhFLYAYUkbP2Lq817N3hdk1Yw=; b=j7Q74kvEIulFKf1ANQmwcaFRLWdUWikTW SPn60loB7E46E26cDmSDqrE3cwloK8sit5CPtlUXNGHrT/49ZHSvvp1y1tGooX5g cZvVao+iGWczwhZbUS3jZHERdN0ECmyuJnxL2LM7IOl+bQW6W+heUYQcj7p6KvLa ColySYMIEwB1dG/n0QLvCfm3pxU5ezHWuxPZkRxo4t1Of9yYGgI+8swETAZIe+aj hZkHbT3cYgzdaoEZtHQvLqZrIrkx/JNJwL+6twzOuk7CvsqBayToSLDu7mUb/74w WGGHoJef8AEJAl6EqaFwGoyxJqFmDGqPoJnr+1F1RmrLDy8oXSn+g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrheelgdekkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepueekkedtffdvtddugeejgedtvefhueefiedvjeeitdeigedtveejvdejheffvefg necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 9 Feb 2022 11:36:33 -0500 (EST) Date: Wed, 9 Feb 2022 11:36:31 -0500 From: Leo Famulari To: Maxim Cournoyer Subject: Re: bug#53791: [PATCH] Revert kernel modules changes to support the Coreboot framebuffer Message-ID: References: <8dbecea6bb418fcfc80d7ffca12e852b71f73c4b.1644018740.git.leo@famulari.name> <87bkzk38no.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87bkzk38no.fsf_-_@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53791-done Cc: 53791-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, Feb 05, 2022 at 11:45:31PM -0500, Maxim Cournoyer wrote: > > To summarize, the 4.4, 4.9, 4.14, 4.19, and 5.16 kernels cannot be used > > on Guix without the user creating a custom initrd-modules in their > > operating-system declaration. > > > > default-initrd-modules should "just work" with all the kernel series > > offered by Guix. > > > > Anyways, it's been a while since the regressions were introduced, and > > still no solution. So I propose that we revert the changes that > > introduced the regression, for now. > > Sounds reasonable to me. Pushed as fd6cfbc05ac093a6b9497e6c38bb4678f33ac14d ------------=_1644424622-2536-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Feb 2022 23:52:57 +0000 Received: from localhost ([127.0.0.1]:33209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG8Ns-0007fI-HZ for submit@debbugs.gnu.org; Fri, 04 Feb 2022 18:52:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:49844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG8Nr-0007fB-Dq for submit@debbugs.gnu.org; Fri, 04 Feb 2022 18:52:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG8Nq-00066T-OA for guix-patches@gnu.org; Fri, 04 Feb 2022 18:52:54 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:48691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG8NN-0003AD-8c for guix-patches@gnu.org; Fri, 04 Feb 2022 18:52:27 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id DD1843202053; Fri, 4 Feb 2022 18:52:23 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 04 Feb 2022 18:52:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=mesmtp; bh=OL1Zd1tEgzxUMoZnPcJ9ag+JxKhE2cVRdYZWGd/HZ44=; b=qG JrTw78yBDOWqSbmXHfw8YfKFYGPvtBPH6uVSk1UramgSOCax4/aboGP3rZTvqsca yu/NiN5IbvlEplMoZeAEDIPLNfS8qGg+6FMgee3UXa4R+kk1bOsbRHMIbuMG2leK k6GqkRoDkoZp0fbZcAmN7M1HstdkxSXHvJt2a5pBA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=OL1Zd1tEgzxUMoZnPcJ9ag+JxKhE2 cVRdYZWGd/HZ44=; b=XIDIudcEyWiE1pbHRbOLCmpW36NG/K1k4aFNPSbawAMOl AYDhSR7wbdsG49k7VWawLCiAVCBWhAeAnDLuKJY5LvKAJu9RRmz72hIeCdqI06jM IRcMwfKLV4FdIFhpCvaTqx6cj8gMZSSZxoHEoxnkkBz0dM8GXy1FZGoQjlJDlCQo GLk9CU9Mg3iU4Fm1ewDwBNcfeMuAwc32AxW4GGrDTiiUArNiRO1ErRK/x92ZXPa2 AR6mVuIx9NoKtf8sw0bQZXZJRha3VQN7SbYnswRnD1UlWHa1DnpIJK1sDqUMNM5D kRQ9nHZy+k2T8it/bq7tOw+XyJwQtivY7almD28EA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrhedtgdduhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdr nhgrmhgvqeenucggtffrrghtthgvrhhnpeetueeigfelheekveffveetffeugeeuuddvge eiffevkeeuffefteduvdfhhfduhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 4 Feb 2022 18:52:23 -0500 (EST) From: Leo Famulari To: guix-patches@gnu.org Subject: [PATCH] Revert kernel modules changes to support the Coreboot framebuffer Date: Fri, 4 Feb 2022 18:52:20 -0500 Message-Id: <8dbecea6bb418fcfc80d7ffca12e852b71f73c4b.1644018740.git.leo@famulari.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.24; envelope-from=leo@famulari.name; helo=wout1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) These changes broke the creation of the 'linux-modules-database' for all kernel series besides 5.15, 5.4, and 5.10, like this: ------ gnu/build/linux-modules.scm:257:5: kernel module not found "framebuffer_coreboot" "/gnu/store/yff45fr6q93mw44zdql9ffr95zcvwxcn-linux-libre-4.9.299/lib/modules" ------ We should support the coreboot framebuffer, but we need to test that change more completely before deploying it. This effectively reverts the following commits: 1dfe8c372163d481ebebb97dd3b4cafa49906b28 "gnu: linux-libre: Build simplefb into all x86{,_64} kernels." bc09e7ab569d5306ce99c5525150695c9d539ef0 "gnu: linux-libre: Support the Coreboot framebuffer." --- gnu/packages/aux-files/linux-libre/4.14-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.14-x86_64.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.19-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.19-x86_64.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.4-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/4.4-x86_64.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/5.10-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/5.10-x86_64.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/5.15-i686.conf | 12 +++--------- gnu/packages/aux-files/linux-libre/5.15-x86_64.conf | 12 +++--------- gnu/packages/aux-files/linux-libre/5.4-i686.conf | 10 ++-------- gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 10 ++-------- gnu/system/linux-initrd.scm | 3 +-- 13 files changed, 27 insertions(+), 100 deletions(-) diff --git a/gnu/packages/aux-files/linux-libre/4.14-i686.conf b/gnu/packages/aux-files/linux-libre/4.14-i686.conf index b7a07b5fe3..16a7817115 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-i686.conf @@ -938,7 +938,7 @@ CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_RXS_GEN3=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations @@ -8495,13 +8495,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf index db11c2f6e8..74b1f2cc18 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf @@ -928,7 +928,7 @@ CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_RXS_GEN3=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations @@ -8332,13 +8332,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.19-i686.conf b/gnu/packages/aux-files/linux-libre/4.19-i686.conf index 5deee8206d..0e6637325d 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-i686.conf @@ -713,7 +713,7 @@ CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_RXS_GEN3=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Binary Emulations @@ -737,13 +737,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf index b76fdc9148..36636ebb8d 100644 --- a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf @@ -684,7 +684,7 @@ CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_RXS_GEN3=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Binary Emulations @@ -714,13 +714,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.4-i686.conf b/gnu/packages/aux-files/linux-libre/4.4-i686.conf index 03aef7abfc..32442eb55a 100644 --- a/gnu/packages/aux-files/linux-libre/4.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.4-i686.conf @@ -825,7 +825,7 @@ CONFIG_RAPIDIO_TSI57X=m CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations @@ -7679,13 +7679,7 @@ CONFIG_DMI_SYSFS=m CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf index 0c7852ba48..adfb848f5b 100644 --- a/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.4-x86_64.conf @@ -795,7 +795,7 @@ CONFIG_RAPIDIO_TSI57X=m CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_CPS_GEN2=m -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Executable file formats / Emulations @@ -7461,13 +7461,7 @@ CONFIG_DMI_SYSFS=m CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/5.10-i686.conf b/gnu/packages/aux-files/linux-libre/5.10-i686.conf index d24bbbcaa2..cb1fdc37ad 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-i686.conf @@ -650,7 +650,7 @@ CONFIG_ALIX=y CONFIG_NET5501=y CONFIG_GEOS=y CONFIG_AMD_NB=y -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # end of Bus options (PCI etc.) # @@ -674,13 +674,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf index 3a905e6286..cd61860af9 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf @@ -643,7 +643,7 @@ CONFIG_MMCONF_FAM10H=y # CONFIG_ISA_BUS is not set CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # end of Bus options (PCI etc.) # @@ -670,13 +670,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/5.15-i686.conf b/gnu/packages/aux-files/linux-libre/5.15-i686.conf index 85bd4d0ee1..3c450f624d 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-i686.conf @@ -2249,14 +2249,8 @@ CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=m -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_SYSFB_SIMPLEFB is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support @@ -6731,7 +6725,7 @@ CONFIG_FB_MB862XX=m CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_I2C=y CONFIG_FB_HYPERV=m -CONFIG_FB_SIMPLE=y +CONFIG_FB_SIMPLE=m CONFIG_FB_SSD1307=m CONFIG_FB_SM712=m # end of Frame buffer Devices diff --git a/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf index ad42192937..ef0f220c80 100644 --- a/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.15-x86_64.conf @@ -2282,14 +2282,8 @@ CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=m -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_SYSFB_SIMPLEFB is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support @@ -6688,7 +6682,7 @@ CONFIG_FB_MB862XX=m CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_I2C=y CONFIG_FB_HYPERV=m -CONFIG_FB_SIMPLE=y +CONFIG_FB_SIMPLE=m CONFIG_FB_SSD1307=m CONFIG_FB_SM712=m # end of Frame buffer Devices diff --git a/gnu/packages/aux-files/linux-libre/5.4-i686.conf b/gnu/packages/aux-files/linux-libre/5.4-i686.conf index 4c4f258dcd..4e2d7795c7 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-i686.conf @@ -648,7 +648,7 @@ CONFIG_ALIX=y CONFIG_NET5501=y CONFIG_GEOS=y CONFIG_AMD_NB=y -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # end of Bus options (PCI etc.) # @@ -672,13 +672,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf index ec8609171e..5815caa770 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf @@ -632,7 +632,7 @@ CONFIG_MMCONF_FAM10H=y # CONFIG_ISA_BUS is not set CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # end of Bus options (PCI etc.) # @@ -659,13 +659,7 @@ CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set -CONFIG_GOOGLE_FIRMWARE=y -# CONFIG_GOOGLE_SMI is not set -CONFIG_GOOGLE_COREBOOT_TABLE=y -# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set -CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set -# CONFIG_GOOGLE_VPD is not set +# CONFIG_GOOGLE_FIRMWARE is not set # # EFI (Extensible Firmware Interface) Support diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index c78dd09205..329cd38cd6 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -352,8 +352,7 @@ (define virtio-modules "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions "nls_iso8859-1" ;for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" system) - '("framebuffer_coreboot" ;for display during early (Core)boot - "pata_acpi" "pata_atiixp" ;for ATA controllers + '("pata_acpi" "pata_atiixp" ;for ATA controllers "isci") ;for SAS controllers like Intel C602 '()) -- 2.34.0 ------------=_1644424622-2536-1--