Split out the 32bit only options from x86-32

Remove unnecessary duplicates, consolidate.

This should reduce having to set the same option twice on 32/64.

1 files changed, 42 insertions, 215 deletions

diff --git a/config-x86-generic b/config-x86-generic
index 52ca62d55..f01a58900 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -1,68 +1,30 @@
 CONFIG_UID16=y
-# CONFIG_64BIT is not set
-# CONFIG_KERNEL_LZMA is not set
 
-#
-# Processor type and features
-#
-#
-# Enable summit and co via the generic arch
-#
 CONFIG_X86_EXTENDED_PLATFORM=y
-CONFIG_X86_32_NON_STANDARD=y
-
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-CONFIG_X86_BIGSMP=y
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_ES7000 is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
+
 CONFIG_SMP=y
-CONFIG_NR_CPUS=64
+
 CONFIG_X86_GENERIC=y
-# CONFIG_X86_PPRO_FENCE is not set
+
 CONFIG_HPET=y
 CONFIG_HPET_TIMER=y
 # CONFIG_HPET_MMAP is not set
-CONFIG_X86_MCE=y
-CONFIG_TOSHIBA=m
+
 CONFIG_I8K=m
-CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
-# CONFIG_NUMA is not set
-
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
 
-# CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
 
@@ -70,60 +32,30 @@ CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFI_PCDP=y
 CONFIG_FB_EFI=y
+
+# FIXME: 32bit only?
 # CONFIG_FB_N411 is not set
 
 CONFIG_DMAR=y
 CONFIG_DMAR_BROKEN_GFX_WA=y
 CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_DMAR_DEFAULT_ON=y
-
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=y
-CONFIG_FB_GEODE_GX=y
-# CONFIG_FB_GEODE_GX1 is not set
-
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-CONFIG_PCI_GOANY=y
-
-#
-# x86 specific drivers
-#
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
-CONFIG_CC_STACKPROTECTOR=y
-
 CONFIG_SECCOMP=y
 
 CONFIG_CAPI_EICON=y
 
-# I2O enabled only for 32-bit x86, disabled for PAE kernel
-CONFIG_I2O=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_I2O_CONFIG=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_ALLOW_INTS is not set
-
 #
 # Kernel debugging
 #
 CONFIG_X86_MPPARSE=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_MMIOTRACE_TEST is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_NMI_TIMEOUT=5
 
 CONFIG_ACPI=y
 CONFIG_ACPI_AC=y
@@ -131,7 +63,6 @@ CONFIG_ACPI_AC=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_BATTERY=y
-CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_DOCK=y
@@ -160,47 +91,24 @@ CONFIG_ACPI_CUSTOM_METHOD=m
 
 CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_X86_PCC_CPUFREQ=y
-# CONFIG_X86_POWERNOW_K6 is not set
-CONFIG_X86_POWERNOW_K7=y
 CONFIG_X86_POWERNOW_K8=y
-# CONFIG_X86_GX_SUSPMOD is not set
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_SPEEDSTEP_ICH=y
-CONFIG_X86_SPEEDSTEP_SMI=y
-CONFIG_X86_SPEEDSTEP_LIB=y
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_X86_P4_CLOCKMOD=y
-CONFIG_X86_LONGRUN=y
-# CONFIG_X86_LONGHAUL is not set
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# e_powersaver is dangerous
-# CONFIG_X86_E_POWERSAVER is not set
-
-CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 
 #
 # various x86 specific drivers
 #
 CONFIG_NVRAM=y
-CONFIG_IBM_ASM=m
-CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_SCHED_SMT=y
+
 CONFIG_SUSPEND=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 
-CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_4KSTACKS is not set
-CONFIG_DEBUG_NMI_TIMEOUT=5
-
-CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_BIOS=y
 
@@ -209,8 +117,7 @@ CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
-# SHPC has half-arsed PCI probing, which makes it load on too many systems
-# CONFIG_HOTPLUG_PCI_SHPC is not set
+
 CONFIG_PM=y
 
 CONFIG_IPW2100=m
@@ -223,9 +130,6 @@ CONFIG_IPW2200_QOS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_ALI1563=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
@@ -234,45 +138,35 @@ CONFIG_I2C_ISCH=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NFORCE2_S4985=m
 CONFIG_I2C_PIIX4=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
 CONFIG_I2C_SIS96X=m
-
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
 
-CONFIG_SCx200_ACB=m
-
-# CONFIG_X86_REBOOTFIXUPS is not set
-
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-CONFIG_GPIO_SCH=m
-CONFIG_PC8736x_GPIO=m
-# CONFIG_NSC_GPIO is not set
-CONFIG_CS5535_GPIO=m
-
 CONFIG_EDAC=y
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_AMD8111=m
+CONFIG_EDAC_AMD8131=m
 CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
 CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I5400=m
-CONFIG_EDAC_R82600=m
-CONFIG_EDAC_AMD8131=m
-CONFIG_EDAC_AMD8111=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I3000=m
 CONFIG_EDAC_I7300=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_R82600=m
 CONFIG_EDAC_X38=m
+CONFIG_EDAC_MCE_INJ=m
+CONFIG_EDAC_DECODE_MCE=m
 
 CONFIG_SCHED_MC=y
 
@@ -283,21 +177,16 @@ CONFIG_TCG_INFINEON=m
 
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_VIA=m
 
-
 # CONFIG_COMPAT_VDSO is not set
 
-# CONFIG_SGI_IOC4 is not set
-
 CONFIG_X86_PLATFORM_DEVICES=y
 
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_EEEPC_LAPTOP=m
-CONFIG_EEEPC_WMI=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_IDEAPAD_LAPTOP=m
@@ -310,40 +199,32 @@ CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
-CONFIG_TC1100_WMI=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
 CONFIG_HP_WMI=m
 # CONFIG_INTEL_SCU_IPC is not set
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_XO15_EBOOK=m
+CONFIG_EEEPC_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
+CONFIG_XO15_EBOOK=m
 
 # CONFIG_TOUCHSCREEN_INTEL_MID is not set
 
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
-CONFIG_IB700_WDT=m
 
-CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x400000
-CONFIG_PHYSICAL_START=0x400000
 CONFIG_CRASH_DUMP=y
-# CONFIG_KEXEC_JUMP is not set
 CONFIG_PROC_VMCORE=y
 CONFIG_CRASH=m
 
-CONFIG_CRYPTO_DEV_GEODE=m
-
-CONFIG_VIDEO_CAFE_CCIC=m
-
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_LGUEST=m
+CONFIG_LGUEST_GUEST=y
 
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
@@ -351,16 +232,15 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 # CONFIG_PARAVIRT_DEBUG is not set
 
 # PARAVIRT_SPINLOCKS has a 5% perf hit
+# FIXME: Still true ? References?
 # CONFIG_PARAVIRT_SPINLOCKS is not set
+
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_KVM_MMU_AUDIT=y # default $x would be nice...
-CONFIG_LGUEST_GUEST=y
-CONFIG_VMI=y
 
 CONFIG_XEN=y
 # CONFIG_XEN_DEBUG is not set
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_SAVE_RESTORE=y
@@ -386,7 +266,6 @@ CONFIG_XEN_PCIDEV_BACKEND=m
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_NAND_CAFE=m
 
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -416,48 +295,28 @@ CONFIG_INTEL_IOATDMA=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_PKGTEMP=m
 
 # CONFIG_CPA_DEBUG is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 
 CONFIG_HP_WATCHDOG=m
 CONFIG_NV_TCO=m
 CONFIG_SP5100_TCO=m
 
-CONFIG_OLPC=y
-CONFIG_OLPC_OPENFIRMWARE=y
-CONFIG_BATTERY_OLPC=y
-CONFIG_MOUSE_PS2_OLPC=y
-CONFIG_OLPC_XO1_PM=y
-CONFIG_OLPC_XO15_SCI=y
-CONFIG_OLPC_XO1_RTC=y
-CONFIG_OLPC_XO1_SCI=y
-# staging
-# CONFIG_FB_OLPC_DCON is not set
-
 CONFIG_STRICT_DEVMEM=y
 
 # CONFIG_NO_BOOTMEM is not set
 
 # CONFIG_MEMTEST is not set
 # CONFIG_MAXSMP is not set
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_SYSPROF_TRACER=y
 
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_MMIOTRACE_TEST is not set
-
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_SYSPROF_TRACER=y
 
 CONFIG_HP_ILO=m
 
 CONFIG_BACKLIGHT_APPLE=m
 
 CONFIG_OPROFILE_IBS=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
 
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW_64K=y
@@ -471,40 +330,22 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_POWER_TRACER=y
 CONFIG_HW_BRANCH_TRACER=y
 
-# CONFIG_SPARSE_IRQ is not set
-
-CONFIG_RCU_FANOUT=32
-
 # CONFIG_IOMMU_STRESS is not set
 
 CONFIG_PERF_COUNTERS=y
 CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 
+CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_ANCIENT_MCE is not set
 # CONFIG_X86_MCE_INJECT is not set
 
-# CONFIG_X86_MRST is not set
 CONFIG_SFI=y
 
 CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_I2C_SCMI=m
-CONFIG_I2C_PXA=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_DECODE_MCE=m
-
-# CONFIG_GPIO_LANGWELL is not set
-
-# CONFIG_INTEL_TXT is not set
-
-CONFIG_CS5535_MFGPT=m
-CONFIG_GEODE_WDT=m
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-
-CONFIG_LEDS_INTEL_SS4200=m
 
 CONFIG_X86_DECODER_SELFTEST=y
 
@@ -519,49 +360,35 @@ CONFIG_PCI_CNB20LE_QUIRK=y
 
 CONFIG_ACPI_EC_DEBUGFS=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
+# CONFIG_ACPI_QUICKSTART is not set
+CONFIG_IDEAPAD_ACPI=m
+
 CONFIG_INTEL_IDLE=y
+
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
-CONFIG_SENSORS_PKGTEMP=m
 CONFIG_F71808E_WDT=m
 CONFIG_HPWDT_NMI_DECODING=y
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_INTEL_MID_DMAC is not set
 CONFIG_PCH_DMA=m
-# CONFIG_ACPI_QUICKSTART is not set
-CONFIG_IDEAPAD_ACPI=m
 CONFIG_INTEL_IPS=m
 # CONFIG_IBM_RTL is not set
 
-CONFIG_OLPC_XO1=m
-CONFIG_XO1_RFKILL=m
 CONFIG_VIDEO_VIA_CAMERA=m
 
-CONFIG_EDAC_MCE_INJ=m
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_X86_RESERVE_LOW=64
 
 CONFIG_PCH_GBE=m
 CONFIG_PCH_PHUB=m
 
-CONFIG_X86_32_IRIS=m
-
 CONFIG_TRANSPARENT_HUGEPAGE=y
 
 CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_AES_586=y
-
-CONFIG_MTD_OF_PARTS=m
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_PROC_DEVICETREE=y
-CONFIG_SERIAL_OF_PLATFORM=m
-CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
-# CONFIG_MMC_SDHCI_OF is not set
 
 CONFIG_HP_ACCEL=m
 
 # CONFIG_RAPIDIO is not set
 
-# CONFIG_X86_INTEL_MID is not set
-
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MCP23S08 is not set