diff options
| -rw-r--r-- | target/linux/x86/config-3.3 | 21 | ||||
| -rw-r--r-- | target/linux/x86/geos/config-default | 12 |
2 files changed, 16 insertions, 17 deletions
diff --git a/target/linux/x86/config-3.3 b/target/linux/x86/config-3.3 index 5a491b9670..04ef2bf973 100644 --- a/target/linux/x86/config-3.3 +++ b/target/linux/x86/config-3.3 @@ -6,7 +6,9 @@ # CONFIG_ALIM1535_WDT is not set # CONFIG_ALIX is not set CONFIG_AMD_NB=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -15,7 +17,6 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_ARCH_POPULATES_NODE_MAP=y # CONFIG_ARCH_RANDOM is not set CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -39,8 +40,6 @@ CONFIG_CLKBLD_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_CLKSRC_I8253=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_CMPXCHG_DOUBLE=y -CONFIG_CMPXCHG_LOCAL=y CONFIG_COMPAT_VDSO=y # CONFIG_CPU5_WDT is not set CONFIG_CPU_FREQ=y @@ -90,7 +89,6 @@ CONFIG_EXT4_FS=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIRMWARE_MEMMAP=y CONFIG_FIX_EARLYCON_MEM=y -# CONFIG_FRAME_POINTER is not set CONFIG_FS_MBCACHE=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -102,19 +100,22 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_PCI_IOMAP=y # CONFIG_GENERIC_TIME_VSYSCALL is not set -# CONFIG_GEOS is not set # CONFIG_GOOGLE_FIRMWARE is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_AOUT=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_ATTRS=y @@ -139,6 +140,7 @@ CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KVM=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_HAVE_OPROFILE=y @@ -238,22 +240,18 @@ CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_NEED_SG_DMA_LENGTH=y # CONFIG_NET_NS is not set -# CONFIG_NET5501 is not set CONFIG_NOHIGHMEM=y CONFIG_NO_BOOTMEM=y CONFIG_NR_CPUS=1 # CONFIG_NSC_GPIO is not set CONFIG_NVRAM=y # CONFIG_OLPC is not set +CONFIG_OPROFILE_NMI_TIMER=y # CONFIG_OPTIMIZE_INLINING is not set CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PARAVIRT_GUEST is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_SC1200 is not set -# CONFIG_PATA_VIA is not set # CONFIG_PC8736x_GPIO is not set # CONFIG_PC87413_WDT is not set CONFIG_PCI=y @@ -279,7 +277,6 @@ CONFIG_PROC_PAGE_MONITOR=y CONFIG_RD_BZIP2=y CONFIG_RD_GZIP=y # CONFIG_RELOCATABLE is not set -CONFIG_RTC=y CONFIG_RTC_CLASS=y # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y @@ -291,7 +288,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_SC520_WDT is not set # CONFIG_SCHED_HRTICK is not set CONFIG_SCSI=y -# CONFIG_SCSI_ISCI is not set CONFIG_SCx200=y CONFIG_SCx200HR_TIMER=y # CONFIG_SCx200_GPIO is not set @@ -323,7 +319,6 @@ CONFIG_USER_STACKTRACE_SUPPORT=y # CONFIG_VIA_WDT is not set CONFIG_VM86=y # CONFIG_VMWARE_BALLOON is not set -# CONFIG_VMWARE_PVSCSI is not set CONFIG_VM_EVENT_COUNTERS=y # CONFIG_W83697UG_WDT is not set # CONFIG_WAFER_WDT is not set diff --git a/target/linux/x86/geos/config-default b/target/linux/x86/geos/config-default index c01a66862e..d923ef0741 100644 --- a/target/linux/x86/geos/config-default +++ b/target/linux/x86/geos/config-default @@ -1,9 +1,7 @@ -# CONFIG_AMD_NB is not set # CONFIG_ATA_PIIX is not set CONFIG_DMI=y CONFIG_DMIID=y # CONFIG_DMI_SYSFS is not set -# CONFIG_FB_GEODE is not set CONFIG_GENERIC_GPIO=y CONFIG_GEOS=y CONFIG_GPIOLIB=y @@ -11,11 +9,17 @@ CONFIG_GPIO_SYSFS=y # CONFIG_HIGHMEM64G is not set CONFIG_HWMON=y # CONFIG_ISDN is not set +# CONFIG_LEDS_CLEVO_MAIL is not set # CONFIG_M486 is not set # CONFIG_MATH_EMULATION is not set CONFIG_MGEODE_LX=y -# CONFIG_PCIEPORTBUS is not set -CONFIG_PCSPKR_PLATFORM=y +CONFIG_NLS=y CONFIG_PATA_CS5536=y +CONFIG_PCI_LABEL=y # CONFIG_SCx200 is not set CONFIG_THERMAL_HWMON=y +CONFIG_X86_CMOV=y +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_X86_TSC=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_USE_PPRO_CHECKSUM=y |