From dc7cc60ca363dc1fef46d05a6b9782e1f0cecdb9 Mon Sep 17 00:00:00 2001
From: Alberto Bursi <bobafetthotmail@gmail.com>
Date: Tue, 21 Apr 2020 21:22:25 +0200
Subject: x86: fix generic kernel 5.4 config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The last kernel update done with commit 500a02bc29b9 ("x86: Update
configuration") placed most of the updated config only in the x86_64
target.
Move the options needed by the other targets too in the x86 base config,
and add an additional option needed by those targets.
Fixes: 500a02bc29b9 ("x86: Update configuration")
Signed-off-by: Alberto Bursi <bobafetthotmail@gmail.com>
[commit subject/description tweaks]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
target/linux/x86/64/config-5.4 | 12 ------------
1 file changed, 12 deletions(-)
(limited to 'target/linux/x86/64')
diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4
index 899668f77e..2c2d06e750 100644
--- a/target/linux/x86/64/config-5.4
+++ b/target/linux/x86/64/config-5.4
@@ -77,7 +77,6 @@ CONFIG_CDROM=y
# CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set
CONFIG_CONNECTOR=y
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
CONFIG_CPU_RMAP=y
CONFIG_CRC_T10DIF=y
CONFIG_CRYPTO_AEAD=y
@@ -130,17 +129,12 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y
CONFIG_DRM_I915_COMPRESS_ERROR=y
# CONFIG_DRM_I915_DEBUG is not set
# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-CONFIG_DRM_I915_FORCE_PROBE=""
CONFIG_DRM_I915_GVT=y
# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
# CONFIG_DRM_I915_SELFTEST is not set
-CONFIG_DRM_I915_SPIN_REQUEST=5
# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
CONFIG_DRM_I915_USERPTR=y
# CONFIG_DRM_I915_WERROR is not set
CONFIG_DRM_KMS_FB_HELPER=y
@@ -159,7 +153,6 @@ CONFIG_EFI_ESRT=y
# CONFIG_EFI_FAKE_MEMMAP is not set
# CONFIG_EFI_MIXED is not set
# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_RCI2_TABLE is not set
CONFIG_EFI_RUNTIME_MAP=y
CONFIG_EFI_RUNTIME_WRAPPERS=y
CONFIG_EFI_STUB=y
@@ -203,7 +196,6 @@ CONFIG_GPIO_IT87=y
CONFIG_GPIO_LYNXPOINT=y
CONFIG_GPIO_SCH=y
CONFIG_GPIO_SYSFS=y
-# CONFIG_HALTPOLL_CPUIDLE is not set
CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
CONFIG_HAVE_ACPI_APEI=y
CONFIG_HAVE_ACPI_APEI_NMI=y
@@ -257,7 +249,6 @@ CONFIG_HYPERV_UTILS=y
# CONFIG_HYPERV_VSOCKETS is not set
CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
-# CONFIG_I2C_AMD_MP2 is not set
CONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_MULTI_INSTANTIATE is not set
# CONFIG_IA32_EMULATION is not set
@@ -267,7 +258,6 @@ CONFIG_INTEL_GTT=y
CONFIG_INTEL_IDLE=y
# CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IPS is not set
-# CONFIG_INTEL_MEI_HDCP is not set
# CONFIG_INTEL_MENLOW is not set
# CONFIG_INTEL_MIC_BUS is not set
CONFIG_INTEL_PCH_THERMAL=y
@@ -344,7 +334,6 @@ CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_PLATFORM=y
CONFIG_PATA_VIA=y
CONFIG_PCC=y
-# CONFIG_PCENGINES_APU2 is not set
CONFIG_PCIEAER=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PME=y
@@ -439,7 +428,6 @@ CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_PCI_LEGACY=y
-# CONFIG_VIRTIO_PMEM is not set
# CONFIG_VIRTIO_VSOCKETS is not set
CONFIG_VIRT_DRIVERS=y
CONFIG_VMAP_STACK=y
--
cgit v1.2.3