aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-02-13 15:20:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-02-13 15:20:45 +0000
commita7336d759076a3233359090a5b5e1acb28cd306f (patch)
treef4580d5445be6c8db9e569a111c927f15ba97216
parent04da86494a0d89025ef7f0c828affa5d9935ab06 (diff)
downloadupstream-a7336d759076a3233359090a5b5e1acb28cd306f.tar.gz
upstream-a7336d759076a3233359090a5b5e1acb28cd306f.tar.bz2
upstream-a7336d759076a3233359090a5b5e1acb28cd306f.zip
make the uml kernel config compatible with both 32 bit and 64 bit systems
SVN-Revision: 6297
-rw-r--r--target/linux/uml-2.6/config44
-rw-r--r--target/linux/uml-2.6/config-diff44
2 files changed, 88 insertions, 0 deletions
diff --git a/target/linux/uml-2.6/config b/target/linux/uml-2.6/config
index 814bd0458f..4086e634ba 100644
--- a/target/linux/uml-2.6/config
+++ b/target/linux/uml-2.6/config
@@ -83,6 +83,7 @@ CONFIG_CRC32=y
CONFIG_CRC_CCITT=m
CONFIG_CRYPTO=y
CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_AES_586 is not set
# CONFIG_CRYPTO_AES_X86_64 is not set
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ANUBIS=m
@@ -112,6 +113,7 @@ CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_TWOFISH=m
+# CONFIG_CRYPTO_TWOFISH_586 is not set
CONFIG_CRYPTO_TWOFISH_COMMON=m
# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
CONFIG_CRYPTO_WP512=m
@@ -172,8 +174,13 @@ CONFIG_GENERIC_HWEIGHT=y
# CONFIG_HAMRADIO is not set
CONFIG_HFSPLUS_FS=m
CONFIG_HFS_FS=m
+# CONFIG_HIGHMEM is not set
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_HOTPLUG=y
# CONFIG_HPFS_FS is not set
# CONFIG_HPPFS is not set
@@ -378,13 +385,27 @@ CONFIG_LOCKDEP_SUPPORT=y
CONFIG_LOCKD_V4=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LSF is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M586TSC is not set
+CONFIG_M686=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_MD is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
CONFIG_MINIX_FS=m
# CONFIG_MINIX_SUBPARTITION 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_MMU=y
CONFIG_MODE_SKAS=y
@@ -393,8 +414,16 @@ CONFIG_MODULES=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
CONFIG_MSDOS_FS=m
CONFIG_MSDOS_PARTITION=y
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MWINCHIPC6 is not set
# CONFIG_NCP_FS is not set
CONFIG_NEST_LEVEL=0
CONFIG_NET=y
@@ -587,6 +616,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_RT_MUTEXES=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_SECURITY is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_SEMAPHORE_SLEEPERS=y
@@ -690,6 +720,20 @@ CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
CONFIG_WIRELESS_EXT=y
# CONFIG_X25 is not set
+CONFIG_X86_BSWAP=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_GENERIC=y
+CONFIG_X86_GOOD_APIC=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_TSC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_XADD=y
CONFIG_XFRM=y
# CONFIG_XFRM_SUB_POLICY is not set
CONFIG_XFRM_USER=m
diff --git a/target/linux/uml-2.6/config-diff b/target/linux/uml-2.6/config-diff
index 8b9abda273..53707e4062 100644
--- a/target/linux/uml-2.6/config-diff
+++ b/target/linux/uml-2.6/config-diff
@@ -12,7 +12,9 @@ CONFIG_BLK_DEV_UBD_SYNC=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_TWOFISH_586 is not set
# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
@@ -26,8 +28,13 @@ CONFIG_EXT3_FS=y
CONFIG_FS_POSIX_ACL=y
# CONFIG_FW_LOADER is not set
# CONFIG_HAMRADIO is not set
+# CONFIG_HIGHMEM is not set
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
@@ -45,12 +52,34 @@ CONFIG_LBD=y
CONFIG_LD_SCRIPT_DYN=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M586TSC is not set
+CONFIG_M686=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_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
# 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
@@ -77,6 +106,7 @@ CONFIG_QUOTACTL=y
CONFIG_RELAY=y
CONFIG_RESOURCES_64BIT=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_SMP_BROKEN=y
CONFIG_SOFT_WATCHDOG=m
@@ -111,6 +141,20 @@ CONFIG_UML_X86=y
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_UNWIND_INFO=y
CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_GENERIC=y
+CONFIG_X86_GOOD_APIC=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_TSC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_XADD=y
CONFIG_XTERM_CHAN=y
CONFIG_ZISOFS_FS=y
CONFIG_ZLIB_DEFLATE=m