Changeset 7ebdf4e

Timestamp:

07/31/2023 01:44:37 PM (11 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.0, 12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

9cc0aba5

Parents:

ece1f60d

git-author:

Xi Ruoyao <xry111@…> (07/30/2023 11:20:06 AM)

git-committer:

Xi Ruoyao <xry111@…> (07/31/2023 01:44:37 PM)

Message:

firmware: Use new kernel configuration rendering

Files:

• kernel-config/kernel-config.py (modified) (1 diff)
• kernel-config/postlfs/config/amd-ucode.toml (added)
• kernel-config/postlfs/config/builtin-fw.toml (added)
• kernel-config/postlfs/config/intel-ucode.toml (added)
• postlfs/config/amd-ucode-kernel.xml (added)
• postlfs/config/builtin-fw-kernel.xml (added)
• postlfs/config/firmware.xml (modified) (3 diffs)
• postlfs/config/intel-ucode-kernel.xml (added)

kernel-config/kernel-config.py

@@ -55 +55 @@
     if d.endswith('=y') or d.endswith('=M'):
         d = d[:-2]
+    elif d.endswith(' != ""'):
+        d = d[:-6]
     return d
 

postlfs/config/firmware.xml

@@ -260 +260 @@
       </para>
 
-<screen><literal>General Setup ---&gt;
-  [*] Initial RAM filesystem and RAM disk (initramfs/initrd) support [CONFIG_BLK_DEV_INITRD]
-Processor type and features  ---&gt;
-  [*] CPU microcode loading support  [CONFIG_MICROCODE]
-  [*]      Intel microcode loading support [CONFIG_MICROCODE_INTEL]</literal></screen>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+        href="intel-ucode-kernel.xml"/>
 
     </sect3>
@@ -304 +301 @@
       </para>
 
-<screen><literal>General Setup ---&gt;
-  [*] Initial RAM filesystem and RAM disk (initramfs/initrd) support [CONFIG_BLK_DEV_INITRD]
-Processor type and features  ---&gt;
-  [*] CPU microcode loading support  [CONFIG_MICROCODE]
-  [*]      AMD microcode loading support [CONFIG_MICROCODE_AMD]</literal></screen>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+        href="amd-ucode-kernel.xml"/>
+
     </sect3>
 
@@ -729 +724 @@
     </para>
 
-    <screen><literal>Device Drivers  ---&gt;
-  Generic Driver Options  ---&gt;
-    Firmware loader ---*gt;
-      -*- Firmware loading facility
-      (<replaceable>amdgpu/aaaa.bin amdgpu/bbbb.bin</replaceable>) Build named firmware blobs into the kernel binary
-      (/lib/firmware) Firmware blobs root directory</literal></screen>
-
-    <para>
-      Replace <replaceable>amdgpu/aaa.bin amdgpu/bbbb.bin</replaceable>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="builtin-fw-kernel.xml"/>
+
+    <para>
+      Replace <replaceable>xx/aa.bin xx/bb.bin</replaceable>
       with a whitespace-separated list of paths to the needed firmware
       files, relative to