diff options
| author |   Yunhong Jiang <yunhong.jiang@linux.intel.com> | 2017-04-28 00:05:56 -0700 |
|---|---|---|
| committer | Yunhong Jiang <yunhong.jiang@linux.intel.com> | 2017-05-02 16:58:53 -0700 |
| commit | 1a114aa2a65e26e65872f5bf61447e5cc7f2951d (patch) | |
| tree | 28ab188c91d12bcf23e728b09c375285f4e85c37 /kernel/arch/x86 | |
| parent | 4375b689ffa0f2f37c04fef7c25aaf9473ba8582 (diff) | |
Change the kernel config for scenario testdanube.2.0stable/danube
Disable the intel_iommu by default since the CICD platform has something
wrong on the VT-d support
Enable the X2APIC support, otherwwise there will be only one CPU
available.
Change-Id: I69206363fa61c751ad982be74db84b020a1c3748
Signed-off-by: Yunhong Jiang <yunhong.jiang@linux.intel.com>
(cherry picked from commit b6b08d2a80b2df28e496ce87705593ed59b282a3)
Diffstat (limited to 'kernel/arch/x86')
| -rw-r--r-- | kernel/arch/x86/configs/opnfv.config | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/arch/x86/configs/opnfv.config b/kernel/arch/x86/configs/opnfv.config index b8ec4a103..a3233ee59 100644 --- a/kernel/arch/x86/configs/opnfv.config +++ b/kernel/arch/x86/configs/opnfv.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.6 Kernel Configuration +# Linux/x86 4.4.50 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -370,10 +370,12 @@ CONFIG_FREEZER=y CONFIG_ZONE_DMA=y CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y -# CONFIG_X86_X2APIC is not set +CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y CONFIG_X86_EXTENDED_PLATFORM=y +# CONFIG_X86_NUMACHIP is not set # CONFIG_X86_VSMP is not set +# CONFIG_X86_UV is not set # CONFIG_X86_GOLDFISH is not set CONFIG_X86_INTEL_LPSS=y CONFIG_X86_AMD_PLATFORM_DEVICE=y @@ -1948,7 +1950,7 @@ CONFIG_HMC6352=m CONFIG_DS1682=m CONFIG_TI_DAC7512=m CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m CONFIG_BMP085_SPI=m CONFIG_USB_SWITCH_FSA9480=m @@ -6933,7 +6935,7 @@ CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_SVM=y -CONFIG_INTEL_IOMMU_DEFAULT_ON=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_IRQ_REMAP=y |