From 6d7e181ba18d11c92409a93936025fb46b9c8171 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 22 Oct 2023 02:00:00 +0200
Subject: gnu: linux-libre@6: Enable Coreboot framebuffer support (again).

This also resolves an unexplained divergence in the i686 and x86_64
kernel configurations.

* gnu/packages/aux-files/linux-libre/6.1-i686.conf,
gnu/packages/aux-files/linux-libre/6.5-i686.conf:
Set CONFIG_DRM_SIMPLEDRM=m.
* gnu/packages/aux-files/linux-libre/6.1-x86_64.conf,
gnu/packages/aux-files/linux-libre/6.5-x86_64.conf:
Likewise, and set CONFIG_SYSFB_SIMPLEFB=y and
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m.

Change-Id: I707a293b58f7502cf107057ee0fa0b23d5630696
---
 gnu/packages/aux-files/linux-libre/6.1-i686.conf   |  2 +-
 gnu/packages/aux-files/linux-libre/6.1-x86_64.conf | 12 ++++++++++--
 gnu/packages/aux-files/linux-libre/6.5-i686.conf   |  2 +-
 gnu/packages/aux-files/linux-libre/6.5-x86_64.conf | 14 +++++++++++---
 4 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/aux-files/linux-libre/6.1-i686.conf b/gnu/packages/aux-files/linux-libre/6.1-i686.conf
index 58f84b901a..7df206d768 100644
--- a/gnu/packages/aux-files/linux-libre/6.1-i686.conf
+++ b/gnu/packages/aux-files/linux-libre/6.1-i686.conf
@@ -6841,7 +6841,7 @@ CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_PANEL_MIPI_DBI=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=m
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9163=m
 CONFIG_TINYDRM_ILI9225=m
diff --git a/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf b/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf
index 31e5744ff3..d1aad1c086 100644
--- a/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf
+++ b/gnu/packages/aux-files/linux-libre/6.1-x86_64.conf
@@ -2305,7 +2305,15 @@ CONFIG_FW_CFG_SYSFS=m
 CONFIG_SYSFB=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 CONFIG_CS_DSP=m
-# CONFIG_GOOGLE_FIRMWARE is not set
+CONFIG_GOOGLE_FIRMWARE=y
+# CONFIG_GOOGLE_SMI is not set
+# CONFIG_GOOGLE_CBMEM is not set
+CONFIG_GOOGLE_COREBOOT_TABLE=m
+# CONFIG_GOOGLE_MEMCONSOLE is not set
+# 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
 
 #
 # EFI (Extensible Firmware Interface) Support
@@ -6831,7 +6839,7 @@ CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_PANEL_MIPI_DBI=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=m
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9163=m
 CONFIG_TINYDRM_ILI9225=m
diff --git a/gnu/packages/aux-files/linux-libre/6.5-i686.conf b/gnu/packages/aux-files/linux-libre/6.5-i686.conf
index 24ac65b663..d9d7cd2ed0 100644
--- a/gnu/packages/aux-files/linux-libre/6.5-i686.conf
+++ b/gnu/packages/aux-files/linux-libre/6.5-i686.conf
@@ -6930,7 +6930,7 @@ CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_PANEL_MIPI_DBI=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=m
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9163=m
 CONFIG_TINYDRM_ILI9225=m
diff --git a/gnu/packages/aux-files/linux-libre/6.5-x86_64.conf b/gnu/packages/aux-files/linux-libre/6.5-x86_64.conf
index e951a5cfa4..dc3a210362 100644
--- a/gnu/packages/aux-files/linux-libre/6.5-x86_64.conf
+++ b/gnu/packages/aux-files/linux-libre/6.5-x86_64.conf
@@ -2350,9 +2350,17 @@ CONFIG_ISCSI_IBFT=m
 CONFIG_FW_CFG_SYSFS=m
 # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 CONFIG_SYSFB=y
-# CONFIG_SYSFB_SIMPLEFB is not set
+CONFIG_SYSFB_SIMPLEFB=y
 CONFIG_FW_CS_DSP=m
-# CONFIG_GOOGLE_FIRMWARE is not set
+CONFIG_GOOGLE_FIRMWARE=y
+# CONFIG_GOOGLE_SMI is not set
+# CONFIG_GOOGLE_CBMEM is not set
+CONFIG_GOOGLE_COREBOOT_TABLE=m
+# CONFIG_GOOGLE_MEMCONSOLE is not set
+# 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
 
 #
 # EFI (Extensible Firmware Interface) Support
@@ -6945,7 +6953,7 @@ CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_PANEL_MIPI_DBI=m
-# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_DRM_SIMPLEDRM=m
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9163=m
 CONFIG_TINYDRM_ILI9225=m
-- 
cgit v1.2.3