From c0d4dc8a84d841b0efde49621e07b69ddd3987d8 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 6 Jan 2025 23:09:51 +0800
Subject: [PATCH] loongarch: kernel: Update kernel config

With DRM panic added to trunk, now we only need 3 additional entries for
EFI boot, thus we can just add them and remove the reference to BLFS
UEFI kernel configuration.
---
 chapter10/kernel.xml          | 8 --------
 chapter10/kernel/systemd.toml | 4 ++++
 chapter10/kernel/systemd.xml  | 4 ++++
 chapter10/kernel/sysv.toml    | 2 ++
 chapter10/kernel/sysv.xml     | 2 ++
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index fde02b4c2..873a5ff96 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -161,14 +161,6 @@
     url="&lfs-root;blfs/view/&short-version;/longindex.html#kernel-config-index">BLFS
     Index of Kernel Settings</ulink>.</para>
 
-    <note>
-      <para>If your host hardware is using UEFI and you wish to boot the
-      LFS system with it, you should adjust some kernel configuration
-      following <ulink url="&blfs-book;postlfs/grub-setup.html#uefi-kernel">
-      the BLFS page</ulink> <emphasis role='bold'>even if you'll use the
-      UEFI bootloader from the host distro</emphasis>.</para>
-    </note>
-
     <variablelist>
       <title>The rationale for the above configuration items:</title>
 
diff --git a/chapter10/kernel/systemd.toml b/chapter10/kernel/systemd.toml
index 387a74b66..5409aa790 100644
--- a/chapter10/kernel/systemd.toml
+++ b/chapter10/kernel/systemd.toml
@@ -33,6 +33,10 @@ CGROUP_SCHED='* '
 
 revision='systemd'
 
+EFI= { value='*', forced = true } # selected by LOONGARCH
+EFI_STUB='*'
+EFI_ZBOOT='*'
+
 [RT_GROUP_SCHED]
 value = ' '
 comment = 'This may cause some systemd features malfunction'
diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml
index ec2551fee..25133130e 100644
--- a/chapter10/kernel/systemd.xml
+++ b/chapter10/kernel/systemd.xml
@@ -18,6 +18,8 @@
   [ ] <emphasis role='blue'>C</emphasis>onfigure standard kernel features (expert users) ---&gt;            [EXPERT]
 
 <emphasis role='blue'>K</emphasis>ernel type and options ---&gt;
+  -*- <emphasis role='blue'>E</emphasis>FI runtime service support                                          [EFI]
+  [*]   <emphasis role='blue'>E</emphasis>FI boot stub support                                         [EFI_STUB]
   [*] <emphasis role='blue'>R</emphasis>elocatable kernel                                           [RELOCATABLE]
   [*]   <emphasis role='blue'>R</emphasis>andomize the address of the kernel (KASLR)             [RANDOMIZE_BASE]
 
@@ -43,6 +45,8 @@
   <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
     [*] <emphasis role='blue'>E</emphasis>xport DMI identification via sysfs to userspace                 [DMIID]
     [*] M<emphasis role='blue'>a</emphasis>rk VGA/VBE/EFI FB as generic system framebuffer       [SYSFB_SIMPLEFB]
+    <emphasis role='blue'>E</emphasis>FI (Extensible Firmware Interface) Support ---&gt;
+      [*] <emphasis role='blue'>E</emphasis>nable the generic EFI decompressor                        [EFI_ZBOOT]
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
     &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
diff --git a/chapter10/kernel/sysv.toml b/chapter10/kernel/sysv.toml
index 0f182dbda..1b8ffcd52 100644
--- a/chapter10/kernel/sysv.toml
+++ b/chapter10/kernel/sysv.toml
@@ -20,6 +20,8 @@ DRM_FBDEV_EMULATION='*'
 DRM_SIMPLEDRM='*'
 FRAMEBUFFER_CONSOLE='*'
 
+EFI= { value='*', forced = true } # selected by LOONGARCH
+EFI_STUB='*'
 EFI_ZBOOT='*'
 
 revision='sysv'
diff --git a/chapter10/kernel/sysv.xml b/chapter10/kernel/sysv.xml
index 855593f8c..ff2e2070a 100644
--- a/chapter10/kernel/sysv.xml
+++ b/chapter10/kernel/sysv.xml
@@ -15,6 +15,8 @@
   [ ] <emphasis role='blue'>C</emphasis>onfigure standard kernel features (expert users) ---&gt;            [EXPERT]
 
 <emphasis role='blue'>K</emphasis>ernel type and options ---&gt;
+  -*- <emphasis role='blue'>E</emphasis>FI runtime service support                                          [EFI]
+  [*]   <emphasis role='blue'>E</emphasis>FI boot stub support                                         [EFI_STUB]
   [*] <emphasis role='blue'>R</emphasis>elocatable kernel                                           [RELOCATABLE]
   [*]   <emphasis role='blue'>R</emphasis>andomize the address of the kernel (KASLR)             [RANDOMIZE_BASE]