Merge pull request kata-containers#1899 from Amulyam24/fragments

kernel: add ppc64le fragments
fidencio · May 25, 2021 · 35f297a · 35f297a
2 parents 9fb301f + 7dde0b5
commit 35f297a
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 2 deletions.
diff --git a/tools/packaging/kernel/configs/fragments/arm64/base.conf b/tools/packaging/kernel/configs/fragments/arm64/base.conf
@@ -42,3 +42,4 @@ CONFIG_ARM64_UAO=y
 
 CONFIG_NO_HZ_FULL=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_RANDOMIZE_BASE=y
diff --git a/tools/packaging/kernel/configs/fragments/common/acpi.conf b/tools/packaging/kernel/configs/fragments/common/acpi.conf
@@ -1,4 +1,4 @@
-# !s390x
+# !s390x !powerpc
 
 # enable ACPI support.
 # This could do with REVIEW

diff --git a/tools/packaging/kernel/configs/fragments/common/base.conf b/tools/packaging/kernel/configs/fragments/common/base.conf
@@ -30,7 +30,6 @@ CONFIG_SHMEM=y
 
 # For security...
 CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
 # FIXME - check if we should be setting this
 # https://github.com/kata-containers/packaging/issues/483
 # I have a feeling it effects our memory hotplug maybe?

diff --git a/tools/packaging/kernel/configs/fragments/common/mmu.conf b/tools/packaging/kernel/configs/fragments/common/mmu.conf
@@ -1,3 +1,5 @@
+#!powerpc
+
 # MMU specific items
 
 # vmap the kernel stacks - detects stack over-runs better and reduces

diff --git a/tools/packaging/kernel/configs/fragments/powerpc/base.conf b/tools/packaging/kernel/configs/fragments/powerpc/base.conf
@@ -0,0 +1,9 @@
+CONFIG_PPC64=y
+CONFIG_PPC_PSERIES=y
+CONFIG_64BIT=y
+CONFIG_HW_RANDOM_PSERIES=y
+
+CONFIG_HAS_IOMEM=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
diff --git a/tools/packaging/kernel/configs/fragments/powerpc/cpu.conf b/tools/packaging/kernel/configs/fragments/powerpc/cpu.conf
@@ -0,0 +1,6 @@
+# Items related to CPU
+
+CONFIG_POWER8_CPU=y
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_CPU_ISOLATION=y
+CONFIG_PPC_DT_CPU_FTRS=y
diff --git a/tools/packaging/kernel/configs/fragments/powerpc/mmu.conf b/tools/packaging/kernel/configs/fragments/powerpc/mmu.conf
@@ -0,0 +1,11 @@
+# ppc64le specific memory related items
+
+CONFIG_SPARSEMEM=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_PPC_TRANSACTIONAL_MEM=y
+CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=8
+CONFIG_PPC_RADIX_MMU_DEFAULT=y
+CONFIG_PPC_RADIX_MMU=y
diff --git a/tools/packaging/kernel/configs/fragments/powerpc/ptp.conf b/tools/packaging/kernel/configs/fragments/powerpc/ptp.conf
@@ -0,0 +1,3 @@
+# PTP clock support
+
+CONFIG_PTP_1588_CLOCK=y
diff --git a/tools/packaging/kernel/configs/fragments/s390/base.conf b/tools/packaging/kernel/configs/fragments/s390/base.conf
@@ -11,3 +11,4 @@ CONFIG_KVM=y
 
 CONFIG_MODULES=y
 CONFIG_MODULE_SIG=y
+CONFIG_RANDOMIZE_BASE=y
diff --git a/tools/packaging/kernel/configs/fragments/x86_64/base.conf b/tools/packaging/kernel/configs/fragments/x86_64/base.conf
@@ -23,3 +23,4 @@ CONFIG_PVH=y
 
 CONFIG_NO_HZ_FULL=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_RANDOMIZE_BASE=y