clean up uml-2.6 config, fixes buildbot pcmcia-cs error

[openwrt.git] / target / linux / uml-2.6 / config-diff

diff --git a/target/linux/uml-2.6/config-diff b/target/linux/uml-2.6/config-diff
index 7087eac..8b9abda 100644 (file)
--- a/target/linux/uml-2.6/config-diff
+++ b/target/linux/uml-2.6/config-diff
@@ -1,5 +1,7 @@
-# CONFIG_3_LEVEL_PGTABLES is not set
-# CONFIG_64BIT is not set
+CONFIG_3_LEVEL_PGTABLES=y
+CONFIG_64BIT=y
+# CONFIG_ARCH_HAS_SC_SIGNALS is not set
+# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set

 # CONFIG_ATM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_BINFMT_MISC=m
 # CONFIG_ATM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_BINFMT_MISC=m


@@ -10,34 +12,22 @@ CONFIG_BLK_DEV_UBD_SYNC=y
 CONFIG_CON_CHAN="xterm"
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CRAMFS=y
 CONFIG_CON_CHAN="xterm"
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CRAMFS=y

-# CONFIG_CRYPTO_AES_586 is not set

 # CONFIG_CRYPTO_AES_X86_64 is not set
 # CONFIG_CRYPTO_AES_X86_64 is not set

-# CONFIG_CRYPTO_TWOFISH_586 is not set

 # CONFIG_CRYPTO_TWOFISH_X86_64 is not set
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
 # CONFIG_CRYPTO_TWOFISH_X86_64 is not set
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"

-CONFIG_DETECT_SOFTLOCKUP=y

 CONFIG_DNOTIFY=y
 CONFIG_ELF_CORE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_DNOTIFY=y
 CONFIG_ELF_CORE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y

-# CONFIG_FORCED_INLINING is not set
-CONFIG_FRAME_POINTER=y

 CONFIG_FS_POSIX_ACL=y
 # CONFIG_FW_LOADER is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_FW_LOADER is not set

-# CONFIG_GCOV is not set
-# CONFIG_GPROF is not set

 # CONFIG_HAMRADIO is not set
 # CONFIG_HAMRADIO is not set

-# CONFIG_HIGHMEM is not set

 CONFIG_HOSTAUDIO=m
 CONFIG_HOSTFS=y
 CONFIG_HOSTAUDIO=m
 CONFIG_HOSTFS=y

-# CONFIG_HOST_VMSPLIT_1G is not set
-# CONFIG_HOST_VMSPLIT_2G is not set
-CONFIG_HOST_VMSPLIT_3G=y
-# CONFIG_HOST_VMSPLIT_3G_OPT is not set

 # CONFIG_HPPFS is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_IFB is not set
 # CONFIG_HPPFS is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_IFB is not set


@@ -49,41 +39,18 @@ CONFIG_IRQ_RELEASE_METHOD=y
 CONFIG_ISO9660_FS=y
 CONFIG_JBD=y
 CONFIG_KALLSYMS=y
 CONFIG_ISO9660_FS=y
 CONFIG_JBD=y
 CONFIG_KALLSYMS=y

-# CONFIG_KALLSYMS_ALL is not set

 CONFIG_KALLSYMS_EXTRA_PASS=y
 CONFIG_KERNEL_STACK_ORDER=2
 CONFIG_LBD=y
 CONFIG_LD_SCRIPT_DYN=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_KALLSYMS_EXTRA_PASS=y
 CONFIG_KERNEL_STACK_ORDER=2
 CONFIG_LBD=y
 CONFIG_LD_SCRIPT_DYN=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256

-# CONFIG_M386 is not set
-CONFIG_M486=y
-# CONFIG_M586 is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M686 is not set

 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MCONSOLE=y
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MCONSOLE=y

-# CONFIG_MCRUSOE is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set

 # CONFIG_MINI_FO is not set
 # CONFIG_MINI_FO is not set

-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set

 # CONFIG_MMAPPER is not set
 CONFIG_MODE_SKAS=y
 # CONFIG_MMAPPER is not set
 CONFIG_MODE_SKAS=y

-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MWINCHIPC6 is not set

 CONFIG_NEST_LEVEL=0
 # CONFIG_NET_RADIO is not set
 CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
 CONFIG_NEST_LEVEL=0
 # CONFIG_NET_RADIO is not set
 CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y


@@ -107,12 +74,11 @@ CONFIG_QFMT_V1=y
 CONFIG_QFMT_V2=y
 CONFIG_QUOTA=y
 CONFIG_QUOTACTL=y
 CONFIG_QFMT_V2=y
 CONFIG_QUOTA=y
 CONFIG_QUOTACTL=y

-# CONFIG_RCU_TORTURE_TEST is not set

 CONFIG_RELAY=y
 CONFIG_RELAY=y

-# CONFIG_RT_MUTEX_TESTER is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_RESOURCES_64BIT=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y

 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_SEMAPHORE_SLEEPERS=y

+CONFIG_SMP_BROKEN=y

 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SQUASHFS_EMBEDDED=y


@@ -121,10 +87,10 @@ CONFIG_SSL_CHAN="pty"
 # CONFIG_STATIC_LINK is not set
 CONFIG_STDERR_CONSOLE=y
 CONFIG_STDIO_CONSOLE=y
 # CONFIG_STATIC_LINK is not set
 CONFIG_STDERR_CONSOLE=y
 CONFIG_STDIO_CONSOLE=y

-CONFIG_STUB_CODE=0xbfffe000
-CONFIG_STUB_DATA=0xbffff000
-CONFIG_STUB_START=0xbfffe000
-CONFIG_TOP_ADDR=0xC0000000
+CONFIG_STUB_CODE=0x7fbfffe000
+CONFIG_STUB_DATA=0x7fbffff000
+CONFIG_STUB_START=0x7fbfffe000
+CONFIG_TOP_ADDR=0x80000000

 # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
 CONFIG_TTY_CHAN=y
 CONFIG_UID16=y
 # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
 CONFIG_TTY_CHAN=y
 CONFIG_UID16=y


@@ -145,16 +111,6 @@ CONFIG_UML_X86=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_UNWIND_INFO=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_UNWIND_INFO=y
 CONFIG_VM_EVENT_COUNTERS=y

-CONFIG_X86_ALIGNMENT_16=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_F00F_BUG=y
-CONFIG_X86_GENERIC=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_XADD=y

 CONFIG_XTERM_CHAN=y
 CONFIG_XTERM_CHAN=y

+CONFIG_ZISOFS_FS=y
+CONFIG_ZLIB_DEFLATE=m