[cip-kernel-config,v2,2/2] 5.10.y-cip: Removing XEN guest support for siemens_ipc227e

Commit Message

Florian Bezdeka Feb. 24, 2021, 12:50 p.m. UTC

From: Florian Bezdeka <[e-mail]>

Remove XEN guest support which is not needed and helps to keep
maintanance simple.

There are some relocations because this file was based on a 4.19
defconfig before.

Notable changes:
  - CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
    Depends on: <choice> && (!X86_INTEL_PSTATE [=y] || !SMP [=y])
    Dependencies are no longer fulfilled, so no longer enabled

  - CONFIG_IA32_AOUT
    Depends on: IA32_EMULATION [=y] && BROKEN [=n]
    Dependencies are no longer fulfilled, so no longer enabled

  - CONFIG_PCIEAER is now set to "y", CONFIG_ACPI_APEI_PCIEAER needs it
    and was already part of the defconfig

Signed-off-by: Florian Bezdeka <[e-mail]>
---

 Changes in v2:                                                                 
  - resend due to local tooling problem

 5.10.y-cip/x86/siemens_ipc227e_defconfig | 69 ++++++------------------
 1 file changed, 17 insertions(+), 52 deletions(-)

Patch

diff --git a/5.10.y-cip/x86/siemens_ipc227e_defconfig b/5.10.y-cip/x86/siemens_ipc227e_defconfig
index 83cc71c..6a0b67e 100644
--- a/5.10.y-cip/x86/siemens_ipc227e_defconfig
+++ b/5.10.y-cip/x86/siemens_ipc227e_defconfig
@@ -14,7 +14,6 @@  CONFIG_IKCONFIG_PROC=y
 CONFIG_NUMA_BALANCING=y
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_CGROUP_PIDS=y
@@ -43,22 +42,17 @@  CONFIG_X86_AMD_PLATFORM_DEVICE=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_SPINLOCKS=y
-CONFIG_XEN=y
-CONFIG_XEN_PVH=y
 CONFIG_GART_IOMMU=y
-CONFIG_CALGARY_IOMMU=y
 CONFIG_NR_CPUS=512
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_NUMA=y
 CONFIG_NUMA_EMU=y
-CONFIG_X86_INTEL_MPX=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_MIXED=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
-CONFIG_KEXEC_VERIFY_SIG=y
 CONFIG_CRASH_DUMP=y
 CONFIG_LIVEPATCH=y
 CONFIG_HIBERNATION=y
@@ -80,19 +74,9 @@  CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_EXTLOG=y
 CONFIG_SFI=y
 CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_INTEL_IDLE=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCI_REALLOC_ENABLE_AUTO=y
-# CONFIG_XEN_PCIDEV_FRONTEND is not set
-CONFIG_PCI_IOV=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_IA32_EMULATION=y
-CONFIG_IA32_AOUT=y
 CONFIG_X86_X32=y
 CONFIG_DMI_SYSFS=y
 CONFIG_EFI_VARS=m
@@ -105,6 +89,7 @@  CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
+# CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_THROTTLING=y
@@ -125,7 +110,6 @@  CONFIG_SGI_PARTITION=y
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
 CONFIG_KARMA_PARTITION=y
-CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_KSM=y
@@ -136,7 +120,6 @@  CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_FRONTSWAP=y
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_ZSWAP=y
-CONFIG_ZBUD=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -159,9 +142,6 @@  CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
 CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_BIC is not set
@@ -172,9 +152,6 @@  CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPV6_MIP6=y
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_MODE_BEET is not set
 # CONFIG_IPV6_SIT is not set
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
@@ -213,13 +190,19 @@  CONFIG_CGROUP_NET_PRIO=y
 CONFIG_BPF_JIT=y
 CONFIG_HAMRADIO=y
 CONFIG_LWTUNNEL=y
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_IOV=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_DEVTMPFS=y
 CONFIG_CONNECTOR=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_BLK_DEV_LOOP=m
-# CONFIG_XEN_BLKDEV_FRONTEND is not set
-# CONFIG_SCSI_MQ_DEFAULT is not set
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_SG=m
@@ -249,14 +232,12 @@  CONFIG_VETH=m
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_AURORA is not set
 CONFIG_NET_TULIP=y
-CONFIG_PCI=y
 CONFIG_IGB=y
 # CONFIG_NET_VENDOR_SEEQ is not set
 CONFIG_FDDI=y
 CONFIG_HIPPI=y
 # CONFIG_USB_NET_DRIVERS is not set
 CONFIG_WAN=y
-# CONFIG_XEN_NETDEV_FRONTEND is not set
 CONFIG_FUJITSU_ES=m
 CONFIG_ISDN=y
 CONFIG_INPUT_MOUSEDEV=y
@@ -274,7 +255,6 @@  CONFIG_INPUT_PCSPKR=m
 # CONFIG_SERIO_SERPORT is not set
 CONFIG_SERIO_RAW=m
 # CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_FINTEK=y
@@ -285,6 +265,7 @@  CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HPET=y
 CONFIG_I2C_I801=m
@@ -321,9 +302,7 @@  CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_VESA=y
 CONFIG_FB_EFI=y
-# CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_SOUND=m
@@ -333,9 +312,9 @@  CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_INPUT_BEEP=y
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_PREALLOC_SIZE=2048
 CONFIG_HID=m
 CONFIG_HID_PID=y
+CONFIG_USB_LED_TRIG=y
 CONFIG_USB=m
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DYNAMIC_MINORS=y
@@ -345,7 +324,6 @@  CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_STORAGE=m
 CONFIG_USB_UAS=m
 CONFIG_USB_GADGET=m
-CONFIG_USB_LED_TRIG=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGERS=y
@@ -359,14 +337,6 @@  CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m
 CONFIG_ASYNC_TX_DMA=y
 CONFIG_VIRT_DRIVERS=y
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
-# CONFIG_XEN_DEV_EVTCHN is not set
-# CONFIG_XENFS is not set
-# CONFIG_XEN_GNTDEV is not set
-# CONFIG_XEN_GRANT_DEV_ALLOC is not set
-# CONFIG_XEN_PCIDEV_BACKEND is not set
-# CONFIG_XEN_ACPI_PROCESSOR is not set
-CONFIG_XEN_MCE_LOG=y
 CONFIG_STAGING=y
 CONFIG_STAGING_MEDIA=y
 CONFIG_CHROME_PLATFORMS=y
@@ -405,8 +375,8 @@  CONFIG_NFSD=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_ASCII=y
 CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 CONFIG_PERSISTENT_KEYRINGS=y
@@ -423,11 +393,9 @@  CONFIG_IMA_DEFAULT_HASH_SHA256=y
 CONFIG_IMA_APPRAISE=y
 CONFIG_DEFAULT_SECURITY_DAC=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
-# CONFIG_CRYPTO_ECHAINIV is not set
 CONFIG_CRYPTO_CRC32C_INTEL=y
 CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_DEV_CCP=y
 # CONFIG_CRYPTO_DEV_CCP_DD is not set
@@ -441,23 +409,20 @@  CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_INFO=y
 CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_POISONING=y
+CONFIG_SCHED_STACK_END_CHECK=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_SCHEDSTATS=y
-CONFIG_SCHED_STACK_END_CHECK=y
 CONFIG_DEBUG_LIST=y
 # CONFIG_RCU_TRACE is not set
+CONFIG_STACK_TRACER=y
+CONFIG_MMIOTRACE=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_TRACER_SNAPSHOT=y
-CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_MMIOTRACE=y
-CONFIG_MEMTEST=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-CONFIG_EARLY_PRINTK_EFI=y
-CONFIG_OPTIMIZE_INLINING=y
+CONFIG_MEMTEST=y