Resync x86_64 kernel config and make uml build ext2 images by default

SVN-Revision: 8034

diff --git a/target/linux/uml-2.6/Makefile b/target/linux/uml-2.6/Makefile
index 2a2c31924f52212067d8103277d9928a05a32036..a54d2cd71fe6d0f609fecd2a77af7ec66ff72781 100644 (file)
--- a/target/linux/uml-2.6/Makefile
+++ b/target/linux/uml-2.6/Makefile
@@ -20,7 +20,7 @@ ARCH:=$(shell uname -m | sed \
 )
 BOARD:=uml
 BOARDNAME:=User Mode Linux
-FEATURES:=broken
+FEATURES:=broken ext2
 LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
 
 LINUX_VERSION:=2.6.22.1

diff --git a/target/linux/uml-2.6/config/x86_64 b/target/linux/uml-2.6/config/x86_64
index 615c7c43aea6bbb811617df8ec98f15a1a5eb74b..8a7f031a1d3680ca60e37d3af97a00ab5f96076c 100644 (file)
--- a/target/linux/uml-2.6/config/x86_64
+++ b/target/linux/uml-2.6/config/x86_64
@@ -29,6 +29,7 @@ CONFIG_FS_POSIX_ACL=y
 # CONFIG_FW_LOADER is not set
 CONFIG_GENERIC_BUG=y
 # CONFIG_HAMRADIO is not set
+CONFIG_HAS_DMA=y
 CONFIG_HOSTAUDIO=m
 CONFIG_HOSTFS=y
 # CONFIG_HPPFS is not set
@@ -38,6 +39,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INIT_ENV_ARG_LIMIT=128
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_CFQ=y
+# CONFIG_IP_NF_MATCH_LAYER7 is not set
 CONFIG_IRQ_RELEASE_METHOD=y
 CONFIG_ISO9660_FS=y
 CONFIG_JBD=y
@@ -54,9 +56,6 @@ CONFIG_MCONSOLE=y
 # CONFIG_MMAPPER is not set
 CONFIG_MODE_SKAS=y
 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
@@ -81,6 +80,7 @@ CONFIG_QUOTACTL=y
 CONFIG_RELAY=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_SMP_BROKEN=y
 CONFIG_SOFT_WATCHDOG=m