From efe51b291ce9f7394a7e2e2c2230e38eb7d04d36 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:13:22 +0200 Subject: [PATCH] kernel: fragment for pmem The option CONFIG_VIRTIO_PMEM is not supported on s390x. It requires nvdimm support. Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/common/pmem.conf | 4 ++++ tools/packaging/kernel/configs/fragments/common/virtio.conf | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 tools/packaging/kernel/configs/fragments/common/pmem.conf diff --git a/tools/packaging/kernel/configs/fragments/common/pmem.conf b/tools/packaging/kernel/configs/fragments/common/pmem.conf new file mode 100644 index 0000000000..97d8d2cc49 --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/common/pmem.conf @@ -0,0 +1,4 @@ +# !s390x + +# This is required for booting from pmem +CONFIG_VIRTIO_PMEM=y diff --git a/tools/packaging/kernel/configs/fragments/common/virtio.conf b/tools/packaging/kernel/configs/fragments/common/virtio.conf index 592ef458b9..0f033c90be 100644 --- a/tools/packaging/kernel/configs/fragments/common/virtio.conf +++ b/tools/packaging/kernel/configs/fragments/common/virtio.conf @@ -15,9 +15,6 @@ CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y -# This is required for booting from pmem -CONFIG_VIRTIO_PMEM=y - # FIXME - are we moving away from/choosing between SCSI and BLK support? # https://github.com/kata-containers/packaging/issues/483 CONFIG_SCSI=y