diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index fef58a49c..0c536f520 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -141,23 +141,6 @@ - Enable some additional features if you are building a 64-bit - system. If you are using menuconfig, enable them in the order of - CONFIG_PCI_MSI first, then - CONFIG_IRQ_REMAP, at last - CONFIG_X86_X2APIC because an option only - shows up after its dependencies are selected. - - - - If you are building a 32-bit system running on a hardware - with RAM more than 4GB, adjust the configuration so the kernel will - be able to use up to 64GB physical RAM: - - - If the partition for the LFS system is in a NVME SSD (i. e. the device node for the partition is /dev/nvme* instead of /dev/sd*), enable NVME support or @@ -288,18 +271,6 @@ - - Support x2apic - - Support running the interrupt controller of 64-bit x86 - processors in x2APIC mode. x2APIC may be enabled by firmware on - 64-bit x86 systems, and a kernel without this option enabled will - panic on boot if x2APIC is enabled by firmware. This option - has no effect, but also does no harm if x2APIC is disabled by the - firmware. - - - Alternatively, make oldconfig may be more 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 4849fc248..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 814484b84..7aea6e6aa 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': 'mips' } main_dep = {} def expand_var(s): diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version index 06a765991..29310f454 100644 --- a/chapter10/kernel/kernel.version +++ b/chapter10/kernel/kernel.version @@ -1 +1 @@ -6.7.1 +6.7.4 diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml index 5ed373790..2738ead80 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 type ---> + [*] Relocatable kernel [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 25cb0c2a6..24acd0feb 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 type ---> + [*] Relocatable kernel [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 e52756879..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]