Changeset c4108e5

Timestamp:

12/05/2023 11:30:10 PM (6 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

d60b247

Parents:

44d31a7 (diff), 31a9142 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Location:

chapter10

Files:

• kernel.xml (modified) (1 diff)
• kernel/Makefile (modified) (1 diff)
• kernel/highmem.xml (modified) (1 diff)
• kernel/kernel-config.py (modified) (2 diffs)
• kernel/kernel.version (modified) (1 diff)
• kernel/systemd.toml (modified) (2 diffs)
• kernel/systemd.xml (modified) (1 diff)
• kernel/sysv.toml (modified) (1 diff)
• kernel/sysv.xml (modified) (1 diff)

chapter10/kernel.xml

@@ -306 +306 @@
 
       <varlistentry>
-        <term><parameter>Framebuffer Console support</parameter></term>
-        <listitem>
-          <para>This is needed to display the Linux console on a frame
-          buffer device.  To allow the kernel to print debug messages at an
-          early boot stage, it shouldn't be built as a kernel module
-          unless an initramfs will be used. And, if
-          <option>CONFIG_DRM</option> (Direct Rendering Manager) is enabled,
-          it's likely <option>CONFIG_DRM_FBDEV_EMULATION</option> (Enable
-          legacy fbdev support for your modesetting driver) should be
-          enabled as well.</para>
+        <term>
+          <parameter>
+            Enable legacy fbdev support for your modesetting driver
+          </parameter> and
+          <parameter>Framebuffer Console support</parameter>
+        </term>
+        <listitem>
+          <para>These are needed to display the Linux console on a
+          GPU driven by a DRI (Direct Rendering Infrastructure) driver.
+          If <option>CONFIG_DRM</option> (Direct Rendering Manager) is
+          enabled, you should enable these two options as well or you'll see
+          a blank screen once the DRI driver is loaded.</para>
         </listitem>
       </varlistentry>

chapter10/kernel/Makefile

@@ -20 +20 @@
         touch s-kernel-version
 
-%.xml: %.toml kernel-config.py kernel_version.py kernel.version
+%.xml.tmp: %.toml kernel-config.py kernel_version.py kernel.version
         ./kernel-config.py $(KERNEL_TREE) $< > $@
+
+%.xml: %.xml.tmp
+        mv $< $@

chapter10/kernel/highmem.xml

@@ -6 +6 @@
 <screen role="nodump"><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
   H<emphasis role='blue'>i</emphasis>gh Memory Support ---&gt;
-    (X) <emphasis role='blue'>6</emphasis>4GB                                                        [HIGHMEM64G]</screen>
+    (X) 64<emphasis role='blue'>G</emphasis>B                                                        [HIGHMEM64G]</screen>

chapter10/kernel/kernel-config.py

@@ -186 +186 @@
             elif line.startswith('endif'):
                 if_stack = if_stack[:-1]
+
+    if config_buf:
+        r += [parse_config(config_buf)]
+
     return r
 
@@ -260 +264 @@
         title = title[:rem - 3] + '...'
 
-    b = title.lstrip('YyMmNnHh')
+    b = title.lstrip('YyMmNnHh.' + "".join(map(str, range(10))))
     a = title[:len(title) - len(b)]
     b0 = "<emphasis role='blue'>" + escape(b[0]) + "</emphasis>"

chapter10/kernel/kernel.version

@@ -1 @@
-6.4.8
+6.6.3

chapter10/kernel/systemd.toml

@@ -14 +14 @@
 DEVTMPFS='*'
 DEVTMPFS_MOUNT='*'
-FB='*'
-FRAMEBUFFER_CONSOLE='*'
-
+DRM=' *M'
 AUDIT=' '
 NET='*'
@@ -29 +27 @@
 
 revision='systemd'
+
+[DRM_FBDEV_EMULATION]
+value = ' *'
+comment = 'If [DRM] is selected as * or M, this must be selected'
+
+[FRAMEBUFFER_CONSOLE]
+value = ' *'
+comment = 'If [DRM] is selected as * or M, this must be selected'

chapter10/kernel/systemd.xml

@@ -42 +42 @@
     [*] <emphasis role='blue'>E</emphasis>xport DMI identification via sysfs to userspace                 [DMIID]
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    <emphasis role='blue'>F</emphasis>rame buffer Devices ---&gt;
-      &lt;*&gt; <emphasis role='blue'>S</emphasis>upport for frame buffer devices ---&gt;                             [FB]
+    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
+                                                                      ...  [DRM]
+    # If [DRM] is selected as * or M, this must be selected:
+    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+                                                      ...  [DRM_FBDEV_EMULATION]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
-      [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]
+      # If [DRM] is selected as * or M, this must be selected:
+      [ /*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                    [FRAMEBUFFER_CONSOLE]
 
 <emphasis role='blue'>F</emphasis>ile systems ---&gt;

chapter10/kernel/sysv.toml

@@ -13 +13 @@
 DEVTMPFS='*'
 DEVTMPFS_MOUNT='*'
-FB='*'
-FRAMEBUFFER_CONSOLE='*'
+DRM=' *M'
 
 revision='sysv'
+
+[DRM_FBDEV_EMULATION]
+value = ' *'
+comment = 'If [DRM] is selected as * or M, this must be selected'
+
+[FRAMEBUFFER_CONSOLE]
+value = ' *'
+comment = 'If [DRM] is selected as * or M, this must be selected'

chapter10/kernel/sysv.xml

@@ -30 +30 @@
                                                            ...  [DEVTMPFS_MOUNT]
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
-    <emphasis role='blue'>F</emphasis>rame buffer Devices ---&gt;
-      &lt;*&gt; <emphasis role='blue'>S</emphasis>upport for frame buffer devices ---&gt;                             [FB]
+    &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
+                                                                      ...  [DRM]
+    # If [DRM] is selected as * or M, this must be selected:
+    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+                                                      ...  [DRM_FBDEV_EMULATION]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;
-      [*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                      [FRAMEBUFFER_CONSOLE]</screen>
+      # If [DRM] is selected as * or M, this must be selected:
+      [ /*] <emphasis role='blue'>F</emphasis>ramebuffer Console support                    [FRAMEBUFFER_CONSOLE]</screen>