kernel: Align ARM configuration with remaining architectures

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index 528b2cd9654782efc5eb4bac605e43b4251807b7..d05c9d68e7a3c2e3bfe074b13d4a49fdca09622f 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -305,12 +305,12 @@ CONFIG_ARM_ERRATA_754327=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
-# CONFIG_ARM_ERRATA_773022 is not set
-# CONFIG_ARM_ERRATA_818325_852422 is not set
-# CONFIG_ARM_ERRATA_821420 is not set
-# CONFIG_ARM_ERRATA_825619 is not set
-# CONFIG_ARM_ERRATA_852421 is not set
-# CONFIG_ARM_ERRATA_852423 is not set
+CONFIG_ARM_ERRATA_773022=y
+CONFIG_ARM_ERRATA_818325_852422=y
+CONFIG_ARM_ERRATA_821420=y
+CONFIG_ARM_ERRATA_825619=y
+CONFIG_ARM_ERRATA_852421=y
+CONFIG_ARM_ERRATA_852423=y
 CONFIG_KRAIT_L2_ACCESSORS=y
 
 #
@@ -361,21 +361,18 @@ CONFIG_NR_CPUS=4
 CONFIG_ARM_PSCI=y
 CONFIG_ARCH_NR_GPIO=1024
 CONFIG_HZ_FIXED=0
-CONFIG_HZ_100=y
 # CONFIG_HZ_200 is not set
-# CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
-CONFIG_HZ=100
 CONFIG_THUMB2_KERNEL=y
 CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_AEABI=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_HIGHMEM=y
-# CONFIG_HIGHPTE is not set
+CONFIG_HIGHPTE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_ARM_MODULE_PLTS=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set

diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index 621ae0d15d7409963cc5d636a0820c66e736c3f8..7bb595ca560e3d150c09e55eac0d79c7d07e28a8 100644 (file)
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -120,9 +120,6 @@ CONFIG_NODES_SHIFT=2
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_HOLES_IN_ZONE=y
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_300=y
-CONFIG_HZ=300
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
@@ -138,7 +135,7 @@ CONFIG_ARMV8_DEPRECATED=y
 CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
+CONFIG_ARM64_SW_TTBR0_PAN=y
 
 #
 # ARMv8.1 architectural features
@@ -152,7 +149,7 @@ CONFIG_ARM64_VHE=y
 # ARMv8.2 architectural features
 #
 CONFIG_ARM64_UAO=y
-# CONFIG_ARM64_PMEM is not set
+CONFIG_ARM64_PMEM=y
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
 CONFIG_ARM64_SVE=y
@@ -232,6 +229,7 @@ CONFIG_ACPI_HED=m
 CONFIG_ACPI_CUSTOM_METHOD=m
 # CONFIG_ACPI_BGRT is not set
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
+# CONFIG_ACPI_NFIT is not set
 # CONFIG_ACPI_APEI is not set
 CONFIG_ACPI_WATCHDOG=y
 # CONFIG_PMIC_OPREGION is not set
@@ -781,6 +779,8 @@ CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
 CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y
 CONFIG_UCS2_STRING=y
 CONFIG_SG_SPLIT=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 
 #
 # Compile-time checks and compiler options

diff --git a/kernel/config-generic b/kernel/config-generic
index b3c7aa85d37aaf03afb119de66ad12b328d977be..f44d360e2348b7cd622c1eb1ce5172e5eb890002 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -219,8 +219,11 @@ CONFIG_SCHED_MC=y
 # Performance monitoring
 #
 CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
 # CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_HOTPLUG_CPU=y
 

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 2bc7ce05f4e18e321ce88f06e24e561858dce348..6b3ae388d9f5ae5e522fe56c9d99eb6ee980b761 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -187,9 +187,6 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_MIXED is not set
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_300=y
-CONFIG_HZ=300
 # CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
 CONFIG_CRASH_DUMP=y
@@ -262,7 +259,7 @@ CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_ACPI_NFIT=m
+# CONFIG_ACPI_NFIT is not set
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 1d9764912a2eeef3e0150e14c33aa5cc0055f2ab..5dce3cf733d37eb02be87cf91269d1fec141e930 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 4.20
-release    = 4
+release    = 5
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>