diff options
author | Leo Famulari <leo@famulari.name> | 2022-02-03 11:57:49 -0500 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2022-02-09 01:38:51 -0500 |
commit | fd6cfbc05ac093a6b9497e6c38bb4678f33ac14d (patch) | |
tree | 97efab75e0637695450e02853398dd2258e3f465 /gnu | |
parent | 0f97729034491c5eab0b10f778d25a4c7d5a6893 (diff) | |
download | guix-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')
-rw-r--r-- | gnu/packages/aux-files/linux-libre/4.14-i686.conf | 10 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/4.14-x86_64.conf | 10 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/4.19-i686.conf | 10 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/4.19-x86_64.conf | 10 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/4.4-i686.conf | 10 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/4.4-x86_64.conf | 10 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/5.10-i686.conf | 10 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/5.10-x86_64.conf | 10 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/5.15-i686.conf | 12 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/5.15-x86_64.conf | 12 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/5.4-i686.conf | 10 | ||||
-rw-r--r-- | gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 10 | ||||
-rw-r--r-- | 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 291f6aa381..3953ee9104 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 @@ -8334,13 +8334,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 0fb0cf9a7f..24148dcf6f 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 89dc907eca..2bcad360a5 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 @@ -7463,13 +7463,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 7111ab0eb0..db52c07f5c 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 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 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 b03a50a391..cec3941971 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 0faf28e4c7..70020ba970 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 d93d6065b8..e2509b773b 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 @@ FILE-SYSTEMS." "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 '()) |