[uml] add 3.3 support

SVN-Revision: 31445

diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index 71246861cd93da79361b38471c7795c67b1eb617..e5c1ce4212619edfb43bc80553f479d1c92cd98d 100644 (file)
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -29,6 +29,7 @@ CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
 CONFIG_DNOTIFY=y
 CONFIG_ELF_CORE=y
 # CONFIG_EMBEDDED is not set
+# CONFIG_EARLY_PRINTK is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT4_FS=y
@@ -119,6 +120,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_SSL=y
 CONFIG_SSL_CHAN="pty"

diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index 42bf07024e9f2a3ccb99b7d76da49abbb1112714..89d2e43d9945fc14d6028c516bd3dde3a96876c4 100644 (file)
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -32,6 +32,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
 CONFIG_DNOTIFY=y
 CONFIG_ELF_CORE=y
+# CONFIG_EARLY_PRINTK is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT4_FS=y
@@ -103,6 +104,7 @@ CONFIG_SMP_BROKEN=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_SSL=y
 CONFIG_SSL_CHAN="pty"

diff --git a/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch
new file mode 100644 (file)
index 0000000..f4aba9b
--- /dev/null
+++ b/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch
@@ -0,0 +1,14 @@
+make ZLIB_DEFLATE visible, so that we can choose whether we want it built-in
+or as a module
+
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -98,7 +98,7 @@ config ZLIB_INFLATE
+       tristate
+ 
+ config ZLIB_DEFLATE
+-      tristate
++      tristate "Zlib compression"
+ 
+ config LZO_COMPRESS
+       tristate