arm64: Adapt kernel configuration data and regenerate

8 files changed, 8 insertions, 35 deletions

diff --git a/chapter10/kernel/highmem.toml b/chapter10/kernel/highmem.toml
deleted file mode 100644
index 2caf42385..000000000
--- a/chapter10/kernel/highmem.toml
+++ /dev/null
@@ -1 +0,0 @@
-HIGHMEM64G='X'
diff --git a/chapter10/kernel/highmem.xml b/chapter10/kernel/highmem.xml
deleted file mode 100644
index 4f0938142..000000000
--- a/chapter10/kernel/highmem.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     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>
diff --git a/chapter10/kernel/kernel-config.py b/chapter10/kernel/kernel-config.py
index a36113175..24f825f72 100755
--- a/chapter10/kernel/kernel-config.py
+++ b/chapter10/kernel/kernel-config.py
@@ -23,7 +23,7 @@ menu_id = 1
 stack = []
 if_stack = []
 
-expand_var_mp = { 'SRCARCH': 'x86' }
+expand_var_mp = { 'SRCARCH': 'arm64' }
 main_dep = {}
 
 def expand_var(s):
diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version
index 4b20d9700..d613169e8 100644
--- a/chapter10/kernel/kernel.version
+++ b/chapter10/kernel/kernel.version
@@ -1 +1 @@
-6.4.8
+6.4.12
diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml
index 6705fdd35..5ddc7dd21 100644
--- a/chapter10/kernel/systemd.xml
+++ b/chapter10/kernel/systemd.xml
@@ -15,9 +15,9 @@
     [*] M<emphasis role='blue'>e</emphasis>mory controller                                                [MEMCG]
   [ ] <emphasis role='blue'>C</emphasis>onfigure standard kernel features (expert users) ---&gt;            [EXPERT]
 
-<emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
-  [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel                                   [RELOCATABLE]
-  [*]   <emphasis role='blue'>R</emphasis>andomize the address of the kernel image (KASLR)       [RANDOMIZE_BASE]
+<emphasis role='blue'>K</emphasis>ernel Features ---&gt;
+  [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel image                             [RELOCATABLE]
+  [*] <emphasis role='blue'>R</emphasis>andomize the address of the kernel image                 [RANDOMIZE_BASE]
 
 <emphasis role='blue'>G</emphasis>eneral architecture-dependent options ---&gt;
   [*] <emphasis role='blue'>S</emphasis>tack Protector buffer overflow detection                 [STACKPROTECTOR]
diff --git a/chapter10/kernel/sysv.xml b/chapter10/kernel/sysv.xml
index 7e62725e6..bb55fd73b 100644
--- a/chapter10/kernel/sysv.xml
+++ b/chapter10/kernel/sysv.xml
@@ -14,9 +14,9 @@
     [*] M<emphasis role='blue'>e</emphasis>mory controller                                                [MEMCG]
   [ ] <emphasis role='blue'>C</emphasis>onfigure standard kernel features (expert users) ---&gt;            [EXPERT]
 
-<emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
-  [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel                                   [RELOCATABLE]
-  [*]   <emphasis role='blue'>R</emphasis>andomize the address of the kernel image (KASLR)       [RANDOMIZE_BASE]
+<emphasis role='blue'>K</emphasis>ernel Features ---&gt;
+  [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel image                             [RELOCATABLE]
+  [*] <emphasis role='blue'>R</emphasis>andomize the address of the kernel image                 [RANDOMIZE_BASE]
 
 <emphasis role='blue'>G</emphasis>eneral architecture-dependent options ---&gt;
   [*] <emphasis role='blue'>S</emphasis>tack Protector buffer overflow detection                 [STACKPROTECTOR]
diff --git a/chapter10/kernel/x2apic.toml b/chapter10/kernel/x2apic.toml
deleted file mode 100644
index 6f7657b13..000000000
--- a/chapter10/kernel/x2apic.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-X86_X2APIC='*'
-PCI='*'
-PCI_MSI='*'
-IOMMU_SUPPORT='*'
-IRQ_REMAP='*'
diff --git a/chapter10/kernel/x2apic.xml b/chapter10/kernel/x2apic.xml
deleted file mode 100644
index 9bd2a719f..000000000
--- a/chapter10/kernel/x2apic.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen role="nodump"><emphasis role='blue'>P</emphasis>rocessor type and features ---&gt;
-  [*] <emphasis role='blue'>S</emphasis>upport x2apic                                                [X86_X2APIC]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] <emphasis role='blue'>P</emphasis>CI support ---&gt;                                                     [PCI]
-    [*] M<emphasis role='blue'>e</emphasis>ssage Signaled Interrupts (MSI and MSI-X)                    [PCI_MSI]
-  [*] <emphasis role='blue'>I</emphasis>OMMU Hardware Support ---&gt;                                [IOMMU_SUPPORT]
-    [*] <emphasis role='blue'>S</emphasis>upport for Interrupt Remapping                              [IRQ_REMAP]</screen>