aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2008-02-06 07:45:40 +0000
committerNicolas Thill <nico@openwrt.org>2008-02-06 07:45:40 +0000
commit0ab670f17d200918d84a8517b3d18aa237d7b3d2 (patch)
tree6a74575e15f983f881fa7a72c6558a6560ee26de
parent78be22e32d594fe0a54da0fdb78ee9898c45145b (diff)
downloadupstream-0ab670f17d200918d84a8517b3d18aa237d7b3d2.tar.gz
upstream-0ab670f17d200918d84a8517b3d18aa237d7b3d2.tar.bz2
upstream-0ab670f17d200918d84a8517b3d18aa237d7b3d2.zip
update uml to 2.6.24 (i386 only for now)
SVN-Revision: 10404
-rw-r--r--target/linux/uml/Makefile2
-rw-r--r--target/linux/uml/config/i38634
2 files changed, 22 insertions, 14 deletions
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index bed9bc99eb..11c8b76468 100644
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
FEATURES:=broken ext2
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
-LINUX_VERSION:=2.6.22.4
+LINUX_VERSION:=2.6.24
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index f2286da4e1..2d62280177 100644
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -1,11 +1,10 @@
# CONFIG_3_LEVEL_PGTABLES is not set
# CONFIG_64BIT is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_HAS_SC_SIGNALS=y
CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
# CONFIG_ATM is not set
CONFIG_BASE_SMALL=0
+# CONFIG_BINFMT_AOUT is not set
CONFIG_BITREVERSE=y
CONFIG_BLK_DEV_COW_COMMON=y
CONFIG_BLK_DEV_UBD=y
@@ -15,8 +14,10 @@ CONFIG_CON_CHAN="xterm"
CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
CONFIG_CRAMFS=y
# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_HW is not set
# CONFIG_CRYPTO_TWOFISH_586 is not set
CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
@@ -29,7 +30,11 @@ CONFIG_EXT3_FS=y
CONFIG_FS_POSIX_ACL=y
# CONFIG_FW_LOADER is not set
CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_GENERIC_CPU is not set
# CONFIG_HAMRADIO is not set
+CONFIG_HAS_DMA=y
# CONFIG_HIGHMEM is not set
CONFIG_HOSTAUDIO=m
CONFIG_HOSTFS=y
@@ -74,21 +79,17 @@ CONFIG_MCONSOLE=y
# 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=y
# CONFIG_MPENTIUMIII is not set
# CONFIG_MPENTIUMM is not set
+# CONFIG_MPSC is not set
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 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_NET_SCH_CLK_JIFFIES is not set
-CONFIG_NET_SCH_FIFO=y
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3_ACL=y
# CONFIG_NFSD_V4 is not set
@@ -104,16 +105,22 @@ CONFIG_NO_IOMEM=y
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y
CONFIG_POSIX_MQUEUE=y
+CONFIG_PRINT_QUOTA_WARNING=y
CONFIG_PTY_CHAN=y
CONFIG_QFMT_V1=y
CONFIG_QFMT_V2=y
CONFIG_QUOTA=y
CONFIG_QUOTACTL=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
CONFIG_RELAY=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_SCSI_WAIT_SCAN=m
CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_SLABINFO=y
+# CONFIG_SMP is not set
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
CONFIG_SQUASHFS_EMBEDDED=y
CONFIG_SSL=y
CONFIG_SSL_CHAN="pty"
@@ -121,10 +128,8 @@ CONFIG_SSL_CHAN="pty"
CONFIG_STATIC_LINK=y
CONFIG_STDERR_CONSOLE=y
CONFIG_STDIO_CONSOLE=y
-CONFIG_STUB_CODE=0xbfffe000
-CONFIG_STUB_DATA=0xbffff000
-CONFIG_STUB_START=0xbfffe000
CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_TICK_ONESHOT=y
CONFIG_TOP_ADDR=0xC0000000
# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
CONFIG_TTY_CHAN=y
@@ -138,25 +143,28 @@ CONFIG_UML_NET_MCAST=y
CONFIG_UML_NET_SLIP=y
CONFIG_UML_NET_SLIRP=y
CONFIG_UML_NET_TUNTAP=y
+# CONFIG_UML_NET_VDE is not set
CONFIG_UML_RANDOM=y
-CONFIG_UML_REAL_TIME_CLOCK=y
CONFIG_UML_SOUND=m
CONFIG_UML_WATCHDOG=m
CONFIG_UML_X86=y
-# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USER_NS is not set
CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_X86_32=y
CONFIG_X86_BSWAP=y
+CONFIG_X86_CMOV=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_MINIMUM_CPU_FAMILY=4
CONFIG_X86_POPAD_OK=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_ZLIB_DEFLATE=m
CONFIG_ZONE_DMA_FLAG=0