From dc7cc60ca363dc1fef46d05a6b9782e1f0cecdb9 Mon Sep 17 00:00:00 2001 From: Alberto Bursi Date: Tue, 21 Apr 2020 21:22:25 +0200 Subject: [PATCH] x86: fix generic kernel 5.4 config MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 [commit subject/description tweaks] Signed-off-by: Petr Å tetiar --- target/linux/x86/64/config-5.4 | 12 ------------ target/linux/x86/config-5.4 | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) 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 diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4 index 4fd590321e..d847960ec0 100644 --- a/target/linux/x86/config-5.4 +++ b/target/linux/x86/config-5.4 @@ -93,6 +93,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set CONFIG_CPU_SUP_AMD=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_CPU_SUP_CYRIX_32=y @@ -127,6 +128,11 @@ CONFIG_DMIID=y CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_DMI_SYSFS=y CONFIG_DNOTIFY=y +# CONFIG_DRM_I915_DEBUG_MMIO is not set +# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set +CONFIG_DRM_I915_FORCE_PROBE="" +CONFIG_DRM_I915_SPIN_REQUEST=5 +CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 CONFIG_DUMMY_CONSOLE=y CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set @@ -134,6 +140,7 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y # CONFIG_EDD is not set CONFIG_EFI_EARLYCON=y +# CONFIG_EFI_RCI2_TABLE is not set # CONFIG_EISA is not set # CONFIG_EUROTECH_WDT is not set CONFIG_EXT4_FS=y @@ -185,6 +192,7 @@ CONFIG_GENERIC_VDSO_32=y CONFIG_GLOB=y # CONFIG_HABANA_AI is not set # CONFIG_HANGCHECK_TIMER is not set +# CONFIG_HALTPOLL_CPUIDLE is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y @@ -263,6 +271,7 @@ CONFIG_HW_RANDOM_GEODE=y CONFIG_HW_RANDOM_VIA=y # CONFIG_HYPERVISOR_GUEST is not set CONFIG_HZ_PERIODIC=y +# CONFIG_I2C_AMD_MP2 is not set CONFIG_I8253_LOCK=y # CONFIG_I8K is not set # CONFIG_IB700_WDT is not set @@ -276,6 +285,7 @@ CONFIG_INIT_STACK_NONE=y CONFIG_INPUT=y CONFIG_INPUT_KEYBOARD=y CONFIG_INSTRUCTION_DECODER=y +# CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_PCH_THERMAL is not set # CONFIG_INTEL_POWERCLAMP is not set # CONFIG_IOSF_MBI is not set @@ -364,6 +374,7 @@ CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PC104=y # CONFIG_PC8736x_GPIO is not set # CONFIG_PC87413_WDT is not set +# CONFIG_PCENGINES_APU2 is not set CONFIG_PCI=y CONFIG_PCI_ATS=y CONFIG_PCI_BIOS=y @@ -405,6 +416,7 @@ CONFIG_RTC_MC146818_LIB=y # CONFIG_SBC_EPX_C3_WATCHDOG is not set # CONFIG_SC1200_WDT is not set CONFIG_SCSI=y +# CONFIG_SCSI_FDOMAIN_ISA is not set # CONFIG_SCSI_MYRS is not set CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCx200=y @@ -460,6 +472,7 @@ CONFIG_USER_STACKTRACE_SUPPORT=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_VGA_CONSOLE=y # CONFIG_VIA_WDT is not set +# CONFIG_VIRTIO_PMEM is not set # CONFIG_VMWARE_VMCI is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_VT=y -- 2.30.2