aboutsummaryrefslogtreecommitdiffstats
path: root/chapter10/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'chapter10/kernel')
-rw-r--r--chapter10/kernel/systemd.toml12
-rw-r--r--chapter10/kernel/systemd.xml10
-rw-r--r--chapter10/kernel/sysv.toml11
-rw-r--r--chapter10/kernel/sysv.xml10
4 files changed, 32 insertions, 11 deletions
diff --git a/chapter10/kernel/systemd.toml b/chapter10/kernel/systemd.toml
index 26ac61c46..dae4a4049 100644
--- a/chapter10/kernel/systemd.toml
+++ b/chapter10/kernel/systemd.toml
@@ -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'
diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml
index bfe3df275..c41b26673 100644
--- a/chapter10/kernel/systemd.xml
+++ b/chapter10/kernel/systemd.xml
@@ -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 device drivers ---&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]
diff --git a/chapter10/kernel/sysv.toml b/chapter10/kernel/sysv.toml
index 5c8b2df6e..3f8d2e93c 100644
--- a/chapter10/kernel/sysv.toml
+++ b/chapter10/kernel/sysv.toml
@@ -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'
diff --git a/chapter10/kernel/sysv.xml b/chapter10/kernel/sysv.xml
index 405dfad0e..c61208c67 100644
--- a/chapter10/kernel/sysv.xml
+++ b/chapter10/kernel/sysv.xml
@@ -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 device drivers ---&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>