Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl 2023-12-06 00:30:10 +01:00
commit c4108e50ae
9 changed files with 54 additions and 24 deletions

View File

@ -305,16 +305,18 @@
</varlistentry>
<varlistentry>
<term><parameter>Framebuffer Console support</parameter></term>
<term>
<parameter>
Enable legacy fbdev support for your modesetting driver
</parameter> and
<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>
<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>

View File

@ -19,5 +19,8 @@ s-kernel-version:
fi
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 $< $@

View File

@ -5,4 +5,4 @@
DO NOT EDIT! -->
<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>

View File

@ -185,6 +185,10 @@ def load_kconfig(file):
if_stack += [top]
elif line.startswith('endif'):
if_stack = if_stack[:-1]
if config_buf:
r += [parse_config(config_buf)]
return r
known_config = {}
@ -259,7 +263,7 @@ for i0, val, i1, title, arrow, key, menu, comment in r:
if len(title) > rem:
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>"
line += escape(a) + b0 + escape(b[1:]) + escape(arrow)

View File

@ -1 +1 @@
6.4.8
6.6.3

View File

@ -13,9 +13,7 @@ STACKPROTECTOR_STRONG='*'
UEVENT_HELPER=' '
DEVTMPFS='*'
DEVTMPFS_MOUNT='*'
FB='*'
FRAMEBUFFER_CONSOLE='*'
DRM=' *M'
AUDIT=' '
NET='*'
INET='*'
@ -28,3 +26,11 @@ TMPFS='*'
TMPFS_POSIX_ACL='*'
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'

View File

@ -41,10 +41,14 @@
<emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
[*] <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;
[*] <emphasis role='blue'>I</emphasis>notify support for userspace [INOTIFY_USER]

View File

@ -12,7 +12,14 @@ STACKPROTECTOR_STRONG='*'
UEVENT_HELPER=' '
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'

View File

@ -29,7 +29,11 @@
[*] <emphasis role='blue'>A</emphasis>utomount devtmpfs at /dev, after the kernel mounted the rootfs
... [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>