From f8bb1a89d64af0d7533ebe0ac913a5cf68c4fae0 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sun, 30 May 2021 23:13:26 +0800
Subject: [PATCH] x86: add missing kernel config

Fixes: #7915
---
 target/linux/x86/config-5.10 |  6 ++++--
 target/linux/x86/config-5.4  | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/target/linux/x86/config-5.10 b/target/linux/x86/config-5.10
index dff86c5cc..970474e50 100644
--- a/target/linux/x86/config-5.10
+++ b/target/linux/x86/config-5.10
@@ -226,7 +226,6 @@ CONFIG_IA32_FEAT_CTL=y
 # CONFIG_IBM_RTL is not set
 # CONFIG_IE6XX_WDT is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0
-# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
@@ -448,6 +447,7 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_TINY_SRCU=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
 # CONFIG_TQMX86_WDT is not set
@@ -457,6 +457,7 @@ CONFIG_TREE_SRCU=y
 CONFIG_UCS2_STRING=y
 CONFIG_UNWINDER_FRAME_POINTER=y
 # CONFIG_UNWINDER_GUESS is not set
+CONFIG_UP_LATE_INIT=y
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_EHCI_HCD=y
@@ -549,10 +550,11 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_X86_TSC=y
 CONFIG_X86_UMIP=y
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_X86_VMX_FEATURE_NAMES=y
-CONFIG_XPS=y
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4
index 9348d0f9f..ba3cc64c8 100644
--- a/target/linux/x86/config-5.4
+++ b/target/linux/x86/config-5.4
@@ -81,6 +81,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
@@ -119,6 +120,11 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 CONFIG_DMI_SYSFS=y
 CONFIG_DNOTIFY=y
 # CONFIG_DPTF_POWER is not set
+# 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
@@ -132,6 +138,9 @@ CONFIG_F2FS_FS=y
 # CONFIG_F71808E_WDT is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_FONT_8x16=y
+CONFIG_FONT_AUTOSELECT=y
+CONFIG_FONT_SUPPORT=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
@@ -167,7 +176,9 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_VDSO_32=y
 # CONFIG_GEOS is not set
 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
@@ -191,6 +202,7 @@ CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 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
@@ -199,6 +211,7 @@ CONFIG_I8253_LOCK=y
 # CONFIG_IE6XX_WDT is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INIT_STACK_NONE=y
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INSTRUCTION_DECODER=y
@@ -254,6 +267,7 @@ CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_MIGRATION=y
+# CONFIG_MISC_ALCOR_PCI is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
@@ -310,6 +324,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
@@ -344,6 +359,8 @@ CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_PID_ARCH_STATUS=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_PUNIT_ATOM_DEBUG is not set
+# CONFIG_PWM_LPSS_PCI is not set
+# CONFIG_PWM_LPSS_PLATFORM is not set
 CONFIG_RATIONAL=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
@@ -358,6 +375,8 @@ CONFIG_SATA_PMP=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
 CONFIG_SCx200HR_TIMER=y
@@ -392,6 +411,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TINY_SRCU=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
 # CONFIG_TQMX86_WDT is not set
@@ -416,8 +436,10 @@ CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 # CONFIG_USER_NS is not set
 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