summaryrefslogtreecommitdiff
path: root/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2022-02-03 11:57:49 -0500
committerLeo Famulari <leo@famulari.name>2022-02-09 01:38:51 -0500
commitfd6cfbc05ac093a6b9497e6c38bb4678f33ac14d (patch)
tree97efab75e0637695450e02853398dd2258e3f465 /gnu/packages/aux-files/linux-libre/5.10-x86_64.conf
parent0f97729034491c5eab0b10f778d25a4c7d5a6893 (diff)
downloadguix-patches-fd6cfbc05ac093a6b9497e6c38bb4678f33ac14d.tar
guix-patches-fd6cfbc05ac093a6b9497e6c38bb4678f33ac14d.tar.gz
Revert kernel modules changes to support the Coreboot framebuffer
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." Fixes <https://issues.guix.gnu.org/52667> "System reconfiguration fails to build linux-modules.drv".
Diffstat (limited to 'gnu/packages/aux-files/linux-libre/5.10-x86_64.conf')
-rw-r--r--gnu/packages/aux-files/linux-libre/5.10-x86_64.conf10
1 files changed, 2 insertions, 8 deletions
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 3a8dbcd3ee..8e970b6422 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