update to linux 3.7.3, disable aufs2, multimedia support needs reworking

3 files changed, 39 insertions, 56 deletions

diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index b50fd47f7..4083b6d13 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -37,7 +37,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X
 	tristate
 	select ADK_KERNEL_CRYPTO
 	select ADK_KERNEL_CRYPTO_HW
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+	#select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	select ADK_KPACKAGE_KMOD_CRYPTO_DES
 	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
 	default n
@@ -97,7 +97,7 @@ config ADK_KERNEL_MOD_CRYPTO_BLKCIPHER
 
 config ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
 	tristate
-	select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
+	#select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	select ADK_KERNEL_MOD_CRYPTO_BLKCIPHER
 	default n
@@ -109,29 +109,29 @@ config ADK_KERNEL_MOD_CRYPTO_WORKQUEUE
 config ADK_KERNEL_MOD_CRYPTO_MANAGER
 	tristate
 
-config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
-	prompt "kmod-crypto-manager2................. Crypto algorithm manager"
-	tristate
-	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
-	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
-	select ADK_KPACKAGE_KMOD_CRYPTO_AEAD2
-	select ADK_KPACKAGE_KMOD_CRYPTO_PCOMP2
-	select ADK_KERNEL_MOD_CRYPTO_MANAGER
-	select ADK_KERNEL_MOD_CRYPTO_WORKQUEUE
-	default n
-	help
+#config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+#	prompt "kmod-crypto-manager2................. Crypto algorithm manager"
+#	tristate
+#	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_AEAD2
+##	select ADK_KPACKAGE_KMOD_CRYPTO_PCOMP2
+#	select ADK_KERNEL_MOD_CRYPTO_MANAGER
+##	select ADK_KERNEL_MOD_CRYPTO_WORKQUEUE
+#	default n
+#	help
 
 config ADK_KPACKAGE_KMOD_CRYPTO_AUTHENC
 	prompt "kmod-crypto-authenc.................. AuthENC (IPsec)"
 	tristate
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+	#select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
 
 config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
 	prompt "kmod-crypto-seqiv.................... Sequence Number IV Generator"
 	tristate
-	select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
+	#select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	help
 	  This IV generator generates an IV based on a sequence number by
@@ -141,7 +141,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CTS
 	prompt "kmod-crypto-cts...................... CTS support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
           CTS: Cipher Text Stealing
@@ -156,7 +156,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CBC
 	tristate
 	depends on !ADK_KERNEL_CRYPTO_CBC
 	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
 	  CBC: Cipher Block Chaining mode
@@ -165,7 +165,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CBC
 config ADK_KPACKAGE_KMOD_CRYPTO_CCM
 	prompt "kmod-crypto-ccm...................... CCM support"
 	tristate
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	select ADK_KPACKAGE_KMOD_CRYPTO_CTR
 	default n
 	help
@@ -174,7 +174,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CCM
 config ADK_KPACKAGE_KMOD_CRYPTO_GCM
 	prompt "kmod-crypto-gcm...................... GCM support"
 	tristate
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	select ADK_KPACKAGE_KMOD_CRYPTO_CTR
 	default n
 	help
@@ -184,7 +184,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_GCM
 config ADK_KPACKAGE_KMOD_CRYPTO_CTR
 	prompt "kmod-crypto-ctr...................... CTR support"
 	tristate
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	select ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
 	default n
 	help
@@ -195,7 +195,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ECB
 	prompt "kmod-crypto-ecb...................... ECB support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
 	  ECB: Electronic CodeBook mode
@@ -206,7 +206,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_HMAC
 	prompt "kmod-crypto-hmac..................... HMAC support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
 	  HMAC: Keyed-Hashing for Message Authentication (RFC2104).
@@ -217,20 +217,20 @@ config ADK_KPACKAGE_KMOD_CRYPTO_XCBC
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
-	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	help
           XCBC: Keyed-Hashing with encryption algorithm
 
 config ADK_KERNEL_MOD_CRYPTO_RNG
 	tristate
 
-config ADK_KPACKAGE_KMOD_CRYPTO_RNG2
-	prompt "kmod-crypto-rng2..................... RNG support"
-	tristate
-	select ADK_KERNEL_MOD_CRYPTO_RNG
-	default n
-	help
-	  Random number generator
+#config ADK_KPACKAGE_KMOD_CRYPTO_RNG2
+#	prompt "kmod-crypto-rng2..................... RNG support"
+#	tristate
+#	select ADK_KERNEL_MOD_CRYPTO_RNG
+#	default n
+#	help
+#	  Random number generator
 endmenu
 
 menu "Digest algorithms"
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index 128f42bd3..9e5a91153 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -10,9 +10,6 @@ config ADK_KERNEL_SND_SOC
 config ADK_KERNEL_SND_PXA2XX_AC97
 	boolean
 
-config ADK_KERNEL_MEDIA_SUPPORT
-	boolean
-
 config ADK_KERNEL_SND_TIMER
 	boolean
 
@@ -129,31 +126,17 @@ config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ
 endmenu
 
 menu "Video devices support"
-config ADK_KPACKAGE_KMOD_VIDEO_DEV
-	prompt "kmod-video-dev.................. Video (For Linux) kernel support"
+config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT
+	prompt "kmod-media-support............... Multimedia support"
 	tristate
-	select ADK_KERNEL_MEDIA_SUPPORT
 	default n
 	help
-	  Support for audio/video capture and overlay devices and FM radio
-	  cards. The exact capabilities of each device vary.
-
-	  This kernel includes support for the new Video for Linux Two API,
-	  (V4L2) as well as the original system. Drivers and applications
-	  need to be rewritten to use V4L2, but drivers for popular cards
-	  and applications for most video capture functions already exist.
-
-	  Additional info and docs are available on the web at
-	  <http://linuxtv.org>
-
-	  Documentation for V4L2 is also available on the web at
-	  <http://bytesex.org/v4l/>.
 
 config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS
 	prompt "kmod-usb-video-class............ Kernel driver for USB video webcams"
 	tristate
 	depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	select ADK_KPACKAGE_KMOD_VIDEO_DEV
+	select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT
 	default n
 	help
 
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index ff3c1515d..e960a22ac 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -34,9 +34,9 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 	  rules for simple packet filtering at local input, forwarding and
 	  local output.  See the man page for iptables(8).
 
-config ADK_KPACKAGE_KMOD_NF_NAT
+config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
-	depends on ADK_KPACKAGE_KMOD_NF_IP_IPTABLES
+	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
@@ -44,7 +44,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_MASQUERADE
 	tristate 'MASQUERADE target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT
+	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	help
 	  Masquerading is a special case of NAT: all outgoing connections are
 	  changed to seem to come from a particular interface's address, and
@@ -78,7 +78,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ULOG
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT
 	tristate 'REDIRECT target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT
+	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	help
 	  REDIRECT is a special case of NAT: all incoming connections are
 	  mapped onto the incoming interface's address, causing the packets to
@@ -87,7 +87,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP
 	tristate 'NETMAP target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT
+	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	help
 	  NETMAP is an implementation of static 1:1 NAT mapping of network
 	  addresses. It maps the network address part, while keeping the host
@@ -96,7 +96,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP
 
 config ADK_KPACKAGE_KMOD_IP_NF_MANGLE
 	tristate 'Packet mangling'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT
+	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	help
 	  This option adds a `mangle' table to iptables: see the man page for
 	  iptables(8).  This table is used for various packet alterations