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 @@ - - - -Processor type and features ---> - High Memory Support ---> - (X) 64GB [HIGHMEM64G] 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 @@ [*] Memory controller [MEMCG] [ ] Configure standard kernel features (expert users) ---> [EXPERT] -Processor type and features ---> - [*] Build a relocatable kernel [RELOCATABLE] - [*] Randomize the address of the kernel image (KASLR) [RANDOMIZE_BASE] +Kernel Features ---> + [*] Build a relocatable kernel image [RELOCATABLE] + [*] Randomize the address of the kernel image [RANDOMIZE_BASE] General architecture-dependent options ---> [*] Stack 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 @@ [*] Memory controller [MEMCG] [ ] Configure standard kernel features (expert users) ---> [EXPERT] -Processor type and features ---> - [*] Build a relocatable kernel [RELOCATABLE] - [*] Randomize the address of the kernel image (KASLR) [RANDOMIZE_BASE] +Kernel Features ---> + [*] Build a relocatable kernel image [RELOCATABLE] + [*] Randomize the address of the kernel image [RANDOMIZE_BASE] General architecture-dependent options ---> [*] Stack 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 @@ - - - -Processor type and features ---> - [*] Support x2apic [X86_X2APIC] - -Device Drivers ---> - [*] PCI support ---> [PCI] - [*] Message Signaled Interrupts (MSI and MSI-X) [PCI_MSI] - [*] IOMMU Hardware Support ---> [IOMMU_SUPPORT] - [*] Support for Interrupt Remapping [IRQ_REMAP]