x86: Refresh subtargets kernel config

This was done by simply running `make kernel_menuconfig CONFIG_TARGET=subtarget`
and then saving without changing any option.

Most of the removed options can be explained because they are already
present in the target config or in the generic 4.9 config:

- PAE-related options, enabled by default on x86 by 961c0eac
- LZO-related options, enabled by default since 4.9

As far as I understand the build system, this shouldn't have any
user-visible impact, because the build system already merges the
various kernel configs during build.

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
This commit is contained in:
Baptiste Jonglez 2017-07-15 18:47:59 +02:00 committed by Daniel Golle
parent 31ba457416
commit 609f169ff4
4 changed files with 10 additions and 72 deletions

View file

@ -26,12 +26,8 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
# CONFIG_ACPI_SBS is not set
CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_VIDEO is not set
# CONFIG_ACPI_WMI is not set
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
CONFIG_ARCH_HAS_KCOV=y
@ -40,14 +36,12 @@ CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
CONFIG_ARCH_MMAP_RND_BITS=28
CONFIG_ARCH_MMAP_RND_BITS_MAX=32
CONFIG_ARCH_MMAP_RND_BITS_MIN=28
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
CONFIG_ARCH_SUPPORTS_INT128=y
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
CONFIG_AUDIT_ARCH=y
# CONFIG_BACKLIGHT_APPLE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
@ -133,6 +127,7 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
CONFIG_GENERIC_CPU=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_GPIOLIB=y
CONFIG_GPIOLIB_IRQCHIP=y
CONFIG_GPIO_ACPI=y
# CONFIG_GPIO_AMDPT is not set
# CONFIG_GPIO_F7188X is not set
@ -144,7 +139,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_HAVE_ACPI_APEI=y
CONFIG_HAVE_ACPI_APEI_NMI=y
# CONFIG_HAVE_AOUT is not set
CONFIG_HAVE_ARCH_HUGE_VMAP=y
CONFIG_HAVE_ARCH_SOFT_DIRTY=y
CONFIG_HAVE_ARCH_VMAP_STACK=y
CONFIG_HAVE_CONTEXT_TRACKING=y
@ -190,7 +184,6 @@ CONFIG_INTEL_IDLE=y
# CONFIG_INTEL_MIC_BUS is not set
# CONFIG_INTEL_PMC_IPC is not set
# CONFIG_IOMMU_DEBUG is not set
CONFIG_IOMMU_HELPER=y
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_ITCO_VENDOR_SUPPORT is not set
CONFIG_ITCO_WDT=y
@ -205,6 +198,7 @@ CONFIG_LEGACY_VSYSCALL_NONE=y
# CONFIG_LIQUIDIO is not set
CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_LPC_ICH=y
CONFIG_LPC_SCH=y
# CONFIG_MAXSMP is not set
CONFIG_MEMORY_BALLOON=y
# CONFIG_MEMORY_HOTPLUG is not set
@ -221,7 +215,6 @@ CONFIG_MMC_SDHCI_PCI=y
CONFIG_MODULES_USE_ELF_RELA=y
# CONFIG_MPSC is not set
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NET_FLOW_LIMIT=y
CONFIG_NR_CPUS=8
# CONFIG_NUMA is not set
@ -240,12 +233,10 @@ CONFIG_PATA_PLATFORM=y
CONFIG_PATA_VIA=y
CONFIG_PCIEAER=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCI_BUS_ADDR_T_64BIT=y
# CONFIG_PCI_HYPERV is not set
# CONFIG_PCI_MMCONFIG is not set
CONFIG_PGTABLE_LEVELS=4
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_PHYS_ADDR_T_64BIT=y
# CONFIG_PMIC_OPREGION is not set
CONFIG_PNP=y
CONFIG_PNPACPI=y
@ -278,7 +269,6 @@ CONFIG_SPARSEMEM_MANUAL=y
# CONFIG_SPARSEMEM_VMEMMAP is not set
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
# CONFIG_SURFACE_PRO3_BUTTON is not set
CONFIG_SWIOTLB=y
# CONFIG_THUNDER_NIC_BGX is not set
# CONFIG_THUNDER_NIC_PF is not set
# CONFIG_THUNDER_NIC_RGX is not set
@ -330,7 +320,6 @@ CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_X86_AMD_FREQ_SENSITIVITY=y
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
CONFIG_X86_CMOV=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_DEBUGCTLMSR=y
CONFIG_X86_DEV_DMA_OPS=y
CONFIG_X86_DIRECT_GBPAGES=y
@ -342,7 +331,6 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64
# CONFIG_X86_PMEM_LEGACY is not set
CONFIG_X86_PM_TIMER=y
# CONFIG_X86_POWERNOW_K8 is not set
CONFIG_X86_TSC=y
# CONFIG_X86_VSYSCALL_EMULATION is not set
CONFIG_X86_X2APIC=y
# CONFIG_X86_X32 is not set

View file

@ -42,13 +42,9 @@ CONFIG_AGP_INTEL=y
# CONFIG_AGP_SWORKS is not set
# CONFIG_AGP_VIA is not set
# CONFIG_APM is not set
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_ARCH_RANDOM=y
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
# CONFIG_BACKLIGHT_APPLE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
@ -57,9 +53,6 @@ CONFIG_BLK_DEV_SR=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_NXP is not set
# CONFIG_COMMON_CLK_PIC32 is not set
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
CONFIG_CPU_IDLE_GOV_MENU=y
CONFIG_CPU_RMAP=y
@ -78,15 +71,10 @@ CONFIG_DRM_AMDGPU=y
# CONFIG_DRM_AMDGPU_SI is not set
# CONFIG_DRM_AMDGPU_USERPTR is not set
# CONFIG_DRM_AMD_ACP is not set
# CONFIG_DRM_AST is not set
CONFIG_DRM_BOCHS=y
CONFIG_DRM_BRIDGE=y
# CONFIG_DRM_CIRRUS_QEMU is not set
CONFIG_DRM_FBDEV_EMULATION=y
# CONFIG_DRM_GMA500 is not set
# CONFIG_DRM_I2C_CH7006 is not set
# CONFIG_DRM_I2C_NXP_TDA998X is not set
# CONFIG_DRM_I2C_SIL164 is not set
CONFIG_DRM_I915=y
# CONFIG_DRM_I915_DEBUG is not set
# CONFIG_DRM_I915_GVT is not set
@ -95,17 +83,11 @@ CONFIG_DRM_I915_USERPTR=y
# CONFIG_DRM_I915_WERROR is not set
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_KMS_HELPER=y
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
# CONFIG_DRM_MGAG200 is not set
CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_NOUVEAU is not set
CONFIG_DRM_PANEL=y
# CONFIG_DRM_QXL is not set
CONFIG_DRM_RADEON=y
# CONFIG_DRM_RADEON_USERPTR is not set
CONFIG_DRM_TTM=y
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_VGEM is not set
CONFIG_DRM_VIRTIO_GPU=y
# CONFIG_DRM_VMWGFX is not set
CONFIG_EARLY_PRINTK_EFI=y
@ -161,7 +143,6 @@ CONFIG_GPIO_ACPI=y
# CONFIG_GPIO_WS16C48 is not set
CONFIG_HAVE_ACPI_APEI=y
CONFIG_HAVE_ACPI_APEI_NMI=y
CONFIG_HAVE_ARCH_HUGE_VMAP=y
CONFIG_HAVE_CLK=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
@ -175,8 +156,6 @@ CONFIG_HDMI=y
CONFIG_HIBERNATE_CALLBACKS=y
CONFIG_HID=y
CONFIG_HID_BATTERY_STRENGTH=y
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
CONFIG_HOTPLUG_CPU=y
CONFIG_HPET=y
CONFIG_HPET_MMAP=y
@ -203,7 +182,6 @@ CONFIG_INTEL_IDLE=y
# CONFIG_INTEL_MENLOW is not set
# CONFIG_INTEL_PMC_IPC is not set
CONFIG_INTERVAL_TREE=y
CONFIG_IOMMU_HELPER=y
CONFIG_IOSF_MBI=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_IRQ_BYPASS_MANAGER=y
@ -226,8 +204,6 @@ CONFIG_KVM_VFIO=y
# CONFIG_LCD_CLASS_DEVICE is not set
# CONFIG_LGUEST_GUEST is not set
CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
# CONFIG_M586MMX is not set
# CONFIG_MDA_CONSOLE is not set
CONFIG_MEMORY_BALLOON=y
@ -262,7 +238,6 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
# CONFIG_MOUSE_VSXXXAA is not set
CONFIG_MPENTIUM4=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NET_FLOW_LIMIT=y
CONFIG_NO_HZ=y
CONFIG_NR_CPUS=4
@ -271,7 +246,6 @@ CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_CLOCK=y
# CONFIG_PARAVIRT_DEBUG is not set
CONFIG_PARAVIRT_SPINLOCKS=y
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
CONFIG_PATA_AMD=y
CONFIG_PATA_ATIIXP=y
CONFIG_PATA_LEGACY=y
@ -286,8 +260,6 @@ CONFIG_PCIE_PME=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_XEN=y
# CONFIG_PCWATCHDOG is not set
CONFIG_PGTABLE_LEVELS=3
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_PINCTRL_BROXTON=y
@ -327,7 +299,6 @@ CONFIG_SCSI_VIRTIO=y
CONFIG_SERIAL_8250_PNP=y
CONFIG_SMP=y
# CONFIG_SURFACE_PRO3_BUTTON is not set
CONFIG_SWIOTLB=y
CONFIG_SWIOTLB_XEN=y
CONFIG_SYS_HYPERVISOR=y
CONFIG_TASKSTATS=y
@ -369,7 +340,6 @@ CONFIG_X86_AMD_FREQ_SENSITIVITY=y
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
# CONFIG_X86_BIGSMP is not set
CONFIG_X86_CMOV=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_X86_E_POWERSAVER is not set
CONFIG_X86_INTEL_LPSS=y
@ -377,14 +347,11 @@ CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=7
CONFIG_X86_L1_CACHE_SHIFT=7
# CONFIG_X86_LONGHAUL is not set
CONFIG_X86_MINIMUM_CPU_FAMILY=5
CONFIG_X86_NEED_RELOCS=y
CONFIG_X86_PAE=y
# CONFIG_X86_PCC_CPUFREQ is not set
# CONFIG_X86_PMEM_LEGACY is not set
CONFIG_X86_PM_TIMER=y
# CONFIG_X86_POWERNOW_K8 is not set
CONFIG_X86_TSC=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_XEN=y
CONFIG_XENFS=y

View file

@ -59,6 +59,8 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_WS16C48 is not set
CONFIG_HAVE_ACPI_APEI=y
CONFIG_HAVE_ACPI_APEI_NMI=y
CONFIG_HID=y
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
# CONFIG_HPET is not set
# CONFIG_HP_ACCEL is not set
@ -77,8 +79,6 @@ CONFIG_ISA_BUS_API=y
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_LANCE is not set
CONFIG_LEDS_GPIO=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
# CONFIG_M586MMX is not set
# CONFIG_MDA_CONSOLE is not set
CONFIG_MFD_CORE=y
@ -98,6 +98,8 @@ CONFIG_PATA_SC1200=y
CONFIG_PC8736x_GPIO=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_PCWATCHDOG is not set
CONFIG_PGTABLE_LEVELS=2
# CONFIG_PHYS_ADDR_T_64BIT is not set
# CONFIG_PMIC_OPREGION is not set
CONFIG_PNP=y
CONFIG_PNPACPI=y
@ -137,8 +139,7 @@ CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_X86_INTEL_LPSS is not set
# CONFIG_X86_LONGHAUL is not set
# CONFIG_X86_MCE is not set
CONFIG_X86_MINIMUM_CPU_FAMILY=4
# CONFIG_X86_PCC_CPUFREQ is not set
CONFIG_X86_PM_TIMER=y
CONFIG_X86_REBOOTFIXUPS=y
CONFIG_X86_TSC=y
# CONFIG_X86_X2APIC is not set

View file

@ -15,7 +15,6 @@ CONFIG_ACPI_CPU_FREQ_PSS=y
CONFIG_ACPI_HOTPLUG_IOAPIC=y
# CONFIG_ACPI_I2C_OPREGION is not set
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
# CONFIG_ACPI_NFIT is not set
# CONFIG_ACPI_PCI_SLOT is not set
CONFIG_ACPI_PROCESSOR=y
# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
@ -41,7 +40,6 @@ CONFIG_AGP_INTEL=y
# CONFIG_AGP_VIA is not set
CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
# CONFIG_BACKLIGHT_APPLE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
@ -49,9 +47,6 @@ CONFIG_BLK_DEV_SR=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_NXP is not set
# CONFIG_COMMON_CLK_PIC32 is not set
CONFIG_CPU_IDLE_GOV_MENU=y
CONFIG_DMA_SHARED_BUFFER=y
# CONFIG_DPTF_POWER is not set
@ -62,15 +57,10 @@ CONFIG_DRM_AMDGPU=y
# CONFIG_DRM_AMDGPU_SI is not set
# CONFIG_DRM_AMDGPU_USERPTR is not set
# CONFIG_DRM_AMD_ACP is not set
# CONFIG_DRM_AST is not set
CONFIG_DRM_BOCHS=y
CONFIG_DRM_BRIDGE=y
# CONFIG_DRM_CIRRUS_QEMU is not set
CONFIG_DRM_FBDEV_EMULATION=y
# CONFIG_DRM_GMA500 is not set
# CONFIG_DRM_I2C_CH7006 is not set
# CONFIG_DRM_I2C_NXP_TDA998X is not set
# CONFIG_DRM_I2C_SIL164 is not set
CONFIG_DRM_I915=y
# CONFIG_DRM_I915_DEBUG is not set
# CONFIG_DRM_I915_GVT is not set
@ -79,20 +69,13 @@ CONFIG_DRM_I915_USERPTR=y
# CONFIG_DRM_I915_WERROR is not set
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_KMS_HELPER=y
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
# CONFIG_DRM_MGAG200 is not set
CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_NOUVEAU is not set
CONFIG_DRM_PANEL=y
# CONFIG_DRM_QXL is not set
CONFIG_DRM_RADEON=y
# CONFIG_DRM_RADEON_USERPTR is not set
CONFIG_DRM_TTM=y
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_VGEM is not set
# CONFIG_DRM_VMWGFX is not set
# CONFIG_EBC_C384_WDT is not set
# CONFIG_EFI is not set
# CONFIG_EISA is not set
# CONFIG_EL3 is not set
CONFIG_FB=y
@ -121,7 +104,6 @@ CONFIG_HAVE_CLK_PREPARE=y
CONFIG_HDMI=y
CONFIG_HID=y
CONFIG_HID_BATTERY_STRENGTH=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
CONFIG_HPET=y
CONFIG_HPET_MMAP=y
@ -149,8 +131,6 @@ CONFIG_ISO9660_FS=y
# CONFIG_JOLIET is not set
# CONFIG_LANCE is not set
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
# CONFIG_MDA_CONSOLE is not set
CONFIG_MFD_CORE=y
CONFIG_MFD_INTEL_LPSS=y
@ -187,6 +167,8 @@ CONFIG_PCIEAER=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_PCWATCHDOG is not set
CONFIG_PGTABLE_LEVELS=2
# CONFIG_PHYS_ADDR_T_64BIT is not set
# CONFIG_PMIC_OPREGION is not set
CONFIG_PNP=y
CONFIG_PNPACPI=y
@ -222,8 +204,8 @@ CONFIG_X86_ACPI_CPUFREQ=y
# CONFIG_X86_E_POWERSAVER is not set
# CONFIG_X86_INTEL_LPSS is not set
# CONFIG_X86_LONGHAUL is not set
CONFIG_X86_MINIMUM_CPU_FAMILY=4
# CONFIG_X86_PAE is not set
# CONFIG_X86_PCC_CPUFREQ is not set
CONFIG_X86_PM_TIMER=y
# CONFIG_X86_POWERNOW_K8 is not set
# CONFIG_X86_X2APIC is not set