summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Calianu <adrian.calianu@enea.com>2018-05-11 13:19:13 +0200
committerAdrian Calianu <adrian.calianu@enea.com>2018-05-11 13:19:13 +0200
commit5ee606c13d87fb454c6755b8bf55fa984428d87f (patch)
treef0be5810c88d9e2464641c60351bc6a450fd1f10
parent5069865aaa6c8664991493530076a16ad99a0a8d (diff)
downloadenea-kernel-cache-5ee606c13d87fb454c6755b8bf55fa984428d87f.tar.gz
atomc-3000: update kernel configs to match with 4.9 kernel
Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
-rw-r--r--bsp/atom-c3000/atom-c3000.cfg6
-rw-r--r--features/printk/printk_y.cfg1
-rw-r--r--features/vfio/vfio_m.cfg (renamed from features/vfio/vfio.cfg)0
-rw-r--r--features/vfio/vfio_m.scc (renamed from features/vfio/vfio.scc)2
4 files changed, 8 insertions, 1 deletions
diff --git a/bsp/atom-c3000/atom-c3000.cfg b/bsp/atom-c3000/atom-c3000.cfg
index eff35e6..43bd6b9 100644
--- a/bsp/atom-c3000/atom-c3000.cfg
+++ b/bsp/atom-c3000/atom-c3000.cfg
@@ -12,15 +12,21 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y
12CONFIG_ACPI_NUMA=y 12CONFIG_ACPI_NUMA=y
13CONFIG_PCI_PRI=y 13CONFIG_PCI_PRI=y
14CONFIG_PCI_PASID=y 14CONFIG_PCI_PASID=y
15CONFIG_IOMMU_SUPPORT=y
15CONFIG_IOMMU_API=y 16CONFIG_IOMMU_API=y
16CONFIG_IOMMU_IOVA=y 17CONFIG_IOMMU_IOVA=y
17CONFIG_AMD_IOMMU=y 18CONFIG_AMD_IOMMU=y
18CONFIG_INTEL_IOMMU=y 19CONFIG_INTEL_IOMMU=y
19CONFIG_INTEL_IOMMU_DEFAULT_ON=n 20CONFIG_INTEL_IOMMU_DEFAULT_ON=n
20CONFIG_INTEL_IOMMU_FLOPPY_WA=y 21CONFIG_INTEL_IOMMU_FLOPPY_WA=y
22CONFIG_INTEL_IOMMU_SVM=y
21CONFIG_MEMORY=y 23CONFIG_MEMORY=y
22CONFIG_KVM_DEVICE_ASSIGNMENT=y 24CONFIG_KVM_DEVICE_ASSIGNMENT=y
23CONFIG_AMD_IOMMU_STATS=y 25CONFIG_AMD_IOMMU_STATS=y
24CONFIG_AMD_IOMMU_V2=y 26CONFIG_AMD_IOMMU_V2=y
25CONFIG_CRYPTO_RSA=y 27CONFIG_CRYPTO_RSA=y
26CONFIG_SERIAL_8250_MID=y 28CONFIG_SERIAL_8250_MID=y
29CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
30CONFIG_MEMORY_ISOLATION=y
31CONFIG_MEMORY_FAILURE=y
32CONFIG_COMPACTION=y
diff --git a/features/printk/printk_y.cfg b/features/printk/printk_y.cfg
index 0fcc9f0..1644716 100644
--- a/features/printk/printk_y.cfg
+++ b/features/printk/printk_y.cfg
@@ -1,4 +1,5 @@
1CONFIG_PRINTK=y 1CONFIG_PRINTK=y
2CONFIG_PRINTK_NMI=y 2CONFIG_PRINTK_NMI=y
3CONFIG_PRINTK_TIME=y
3CONFIG_EARLY_PRINTK=y 4CONFIG_EARLY_PRINTK=y
4CONFIG_X86_VERBOSE_BOOTUP=y 5CONFIG_X86_VERBOSE_BOOTUP=y
diff --git a/features/vfio/vfio.cfg b/features/vfio/vfio_m.cfg
index f42b937..f42b937 100644
--- a/features/vfio/vfio.cfg
+++ b/features/vfio/vfio_m.cfg
diff --git a/features/vfio/vfio.scc b/features/vfio/vfio_m.scc
index c9369cb..f971caf 100644
--- a/features/vfio/vfio.scc
+++ b/features/vfio/vfio_m.scc
@@ -1,4 +1,4 @@
1define KFEATURE_DESCRIPTION "Enable VFIO" 1define KFEATURE_DESCRIPTION "Enable VFIO"
2define KFEATURE_COMPATIBILITY all 2define KFEATURE_COMPATIBILITY all
3 3
4kconf non-hardware vfio.cfg 4kconf non-hardware vfio_m.cfg