final kernel config cleanup

22 files changed, 301 insertions, 370 deletions

diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index 08f438489..9db686d6b 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -13,6 +13,7 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_SDIO
 	select ADK_TARGET_WITH_SOUND
+	seelct ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_PACKAGE_U_BOOT_IMX6
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 70fc094f7..778f4aa7c 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -10,21 +10,12 @@ source target/linux/config/Config.in.pcmcia
 source target/linux/config/Config.in.network
 source target/linux/config/Config.in.netfilter
 source target/linux/config/Config.in.audio
-source target/linux/config/Config.in.video
+source target/linux/config/Config.in.webcam
 source target/linux/config/Config.in.crypto
 source target/linux/config/Config.in.bluetooth
-source target/linux/config/Config.in.rtc
-source target/linux/config/Config.in.watchdog
-source target/linux/config/Config.in.leds
 source target/linux/config/Config.in.misc
 source target/linux/config/Config.in.mips
-source target/linux/config/Config.in.lib
 source target/linux/config/Config.in.pm
-source target/linux/config/Config.in.spi
 source target/linux/config/Config.in.kvm
 source target/linux/config/Config.in.virtio
-source target/linux/config/Config.in.regulator
-source target/linux/config/Config.in.gpio
-source target/linux/config/Config.in.i2c
-source target/linux/config/Config.in.dma
 source target/linux/config/Config.in.debug
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 4ad57b7a6..01404e9bd 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -1,4 +1,4 @@
-menu "Crypto kernel modules"
+menu "Crypto support"
 config ADK_KERNEL_CRYPTO
 	tristate
 
@@ -17,9 +17,10 @@ config ADK_KERNEL_CRYPTO_CBC
 comment "Hardware cryptography"
 
 menu "Hardware crypto devices"
+depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_GEODE_CRYPTO
 
 config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE
-	prompt "kmod-crypto-dev-geode.................. Support for the Geode LX/GX AES engine"
+	prompt "Support for the Geode LX/GX AES engine"
 	tristate
 	select ADK_KERNEL_CRYPTO
 	select ADK_KERNEL_CRYPTO_HW
@@ -33,20 +34,19 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE
 	  engine for the CryptoAPI AES algorithm.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_DEV_HIFN_795X
-	prompt "kmod-crypto-dev-hifn-795x.............. Driver for HIFN 795x crypto accelerator chips"
+	prompt "Driver for HIFN 795x crypto accelerator chips"
 	tristate
+	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
 	select ADK_KERNEL_CRYPTO
 	select ADK_KERNEL_CRYPTO_HW
-	#select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	select ADK_KPACKAGE_KMOD_CRYPTO_DES
-	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
 	default n
 	help
 	  This option allows you to have support for HIFN 795x crypto adapters.
 
 endmenu
 
-comment "Software cryptography"
+comment "Software cryptography support"
 
 menu "Crypto core / Block and Hash modes"
 
@@ -109,27 +109,14 @@ 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_AUTHENC
-	prompt "kmod-crypto-authenc.................. AuthENC (IPsec)"
+	prompt "AuthENC (IPsec)"
 	tristate
-	#select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
 
 config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
-	prompt "kmod-crypto-seqiv.................... Sequence Number IV Generator"
+	prompt "Sequence Number IV Generator"
 	tristate
 	#select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
@@ -138,10 +125,9 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
 	  xoring it with a salt.  This algorithm is mainly useful for CTR
 
 config ADK_KPACKAGE_KMOD_CRYPTO_CTS
-	prompt "kmod-crypto-cts...................... CTS support"
+	prompt "CTS support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
-#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
           CTS: Cipher Text Stealing
@@ -152,29 +138,26 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CTS
           for AES encryption.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_CBC
-	prompt "kmod-crypto-cbc...................... CBC support"
+	prompt "CBC support"
 	tristate
 	depends on !ADK_KERNEL_CRYPTO_CBC
 	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
-#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
 	  CBC: Cipher Block Chaining mode
 	  This block cipher algorithm is required for IPSec.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_CCM
-	prompt "kmod-crypto-ccm...................... CCM support"
+	prompt "CCM support"
 	tristate
-#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	select ADK_KPACKAGE_KMOD_CRYPTO_CTR
 	default n
 	help
 	  Support for Counter with CBC MAC. Required for IPsec.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_GCM
-	prompt "kmod-crypto-gcm...................... GCM support"
+	prompt "GCM support"
 	tristate
-#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	select ADK_KPACKAGE_KMOD_CRYPTO_CTR
 	default n
 	help
@@ -182,9 +165,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_GCM
           Authentication Code (GMAC). Required for IPSec.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_CTR
-	prompt "kmod-crypto-ctr...................... CTR support"
+	prompt "CTR support"
 	tristate
-#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	select ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
 	default n
 	help
@@ -192,10 +174,9 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CTR
 	  This block cipher algorithm is required for IPSec.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_ECB
-	prompt "kmod-crypto-ecb...................... ECB support"
+	prompt "ECB support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
-#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
 	  ECB: Electronic CodeBook mode
@@ -203,72 +184,63 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ECB
 	  the input block by block.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_HMAC
-	prompt "kmod-crypto-hmac..................... HMAC support"
+	prompt "HMAC support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
-#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
 	default n
 	help
 	  HMAC: Keyed-Hashing for Message Authentication (RFC2104).
 	  This is required for IPSec.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_XCBC
-	prompt "kmod-crypto-xcbc..................... XCBC support"
+	prompt "XCBC support"
 	tristate
-	default n
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
-#	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+	default n
 	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
 endmenu
 
 menu "Digest algorithms"
 
 config ADK_KPACKAGE_KMOD_CRYPTO_MD4
-	prompt "kmod-crypto-md4...................... MD4 digest algorithm"
+	prompt "MD4 digest algorithm"
 	tristate
-	default n
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+	default n
 	help
 	  MD4 message digest algorithm (RFC1320).
 
 config ADK_KPACKAGE_KMOD_CRYPTO_MD5
-	prompt "kmod-crypto-md5...................... MD5 digest algorithm"
+	prompt "MD5 digest algorithm"
 	tristate
-	default n
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+	default n
 	help
 	  MD5 message digest algorithm (RFC1321).
 
 config ADK_KPACKAGE_KMOD_CRYPTO_SHA1
-	prompt "kmod-crypto-sha1..................... SHA1 digest algorithm"
+	prompt "SHA1 digest algorithm"
 	tristate
-	default n
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+	default n
 	help
 	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
 
 config ADK_KPACKAGE_KMOD_CRYPTO_SHA256
-	prompt "kmod-crypto-sha256................... SHA256 digest algorithm"
+	prompt "SHA256 digest algorithm"
 	tristate
-	default n
 	depends on !ADK_KERNEL_CRYPTO_SHA256
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+	default n
 	help
 	  SHA256 secure hash standard (DFIPS 180-2).
 	  
@@ -276,11 +248,11 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SHA256
 	  security against collision attacks.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_SHA512
-	prompt "kmod-crypto-sha512................... SHA512 digest algorithm"
+	prompt "SHA512 digest algorithm"
 	tristate
-	default n
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+	default n
 	help
 	  SHA512 secure hash standard (DFIPS 180-2).
 	  
@@ -291,11 +263,11 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SHA512
 	  of security against collision attacks.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_WP512
-	prompt "kmod-crypto-whirlpool................ Whirlpool digest algorithms"
+	prompt "Whirlpool digest algorithms"
 	tristate
-	default n
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+	default n
 	help
 	  Whirlpool hash algorithm 512, 384 and 256-bit hashes
 
@@ -306,11 +278,11 @@ config ADK_KPACKAGE_KMOD_CRYPTO_WP512
 	  <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
 
 config ADK_KPACKAGE_KMOD_CRYPTO_TGR192
-	prompt "kmod-crypto-tiger.................... Tiger digest algorithms"
+	prompt "Tiger digest algorithms"
 	tristate
-	default n
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
+	default n
 	help
 	  Tiger hash algorithm 192, 160 and 128-bit hashes
 
@@ -325,7 +297,7 @@ endmenu
 menu "Cipher algoritms"
 
 config ADK_KPACKAGE_KMOD_CRYPTO_AES
-	prompt "kmod-crypto-aes...................... AES cipher algorithms"
+	prompt "AES cipher algorithms"
 	tristate
 	depends on !ADK_KERNEL_CRYPTO_AES
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
@@ -348,7 +320,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_AES
 	  See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_AES_586
-	prompt "kmod-crypto-aes-i586................. AES cipher algorithms (i586)"
+	prompt "AES cipher algorithms (i586)"
 	tristate
 	depends on ADK_x86
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
@@ -371,7 +343,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_AES_586
 	  See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_ANUBIS
-	prompt "kmod-crypto-anubis................... Anubis cipher algorithm"
+	prompt "Anubis cipher algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -387,7 +359,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ANUBIS
 	  <http://planeta.terra.com.br/informatica/paulobarreto/AnubisPage.html>
 
 config ADK_KPACKAGE_KMOD_CRYPTO_ARC4
-	prompt "kmod-crypto-arc4..................... ARC4 cipher algorithm"
+	prompt "ARC4 cipher algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -399,9 +371,8 @@ config ADK_KPACKAGE_KMOD_CRYPTO_ARC4
 	  WEP, but it should not be for other purposes because of the
 	  weakness of the algorithm.
 
-
 config ADK_KPACKAGE_KMOD_CRYPTO_BLOWFISH
-	prompt "kmod-crypto-blowfish................. Blowfish cipher algorithm"
+	prompt "Blowfish cipher algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -416,7 +387,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_BLOWFISH
 	  <http://www.schneier.com/blowfish.html>
 
 config ADK_KPACKAGE_KMOD_CRYPTO_CAMELLIA
-	prompt "kmod-crypto-camellia................. Camellia cipher algorithms"
+	prompt "Camellia cipher algorithms"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -432,7 +403,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CAMELLIA
 	  <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
 
 config ADK_KPACKAGE_KMOD_CRYPTO_CAST5
-	prompt "kmod-crypto-cast5.................... CAST5 (CAST-128) cipher algorithm"
+	prompt "CAST5 (CAST-128) cipher algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -441,7 +412,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CAST5
 	  described in RFC2144.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_CAST6
-	prompt "kmod-crypto-cast6.................... CAST6 (CATS-256) cipher algorithm"
+	prompt "CAST6 (CATS-256) cipher algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -450,7 +421,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CAST6
 	  described in RFC2612.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_DES
-	prompt "kmod-crypto-des...................... DES and Triple DES EDE cipher algorithms"
+	prompt "DES and Triple DES EDE cipher algorithms"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -458,7 +429,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DES
 	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
 config ADK_KPACKAGE_KMOD_CRYPTO_FCRYPT
-	prompt "kmod-crypto-fcrypt................... FCrypt cipher algorithms"
+	prompt "FCrypt cipher algorithms"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -466,7 +437,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_FCRYPT
 	  FCrypt algorithm used by RxRPC.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_KHAZAD
-	prompt "kmod-crypto-khazad................... Khazad cipher algorithm"
+	prompt "Khazad cipher algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -481,7 +452,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_KHAZAD
 	  <http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html>
 
 config ADK_KPACKAGE_KMOD_CRYPTO_SERPENT
-	prompt "kmod-crypto-serpent.................. Serpent cipher algorithm"
+	prompt "Serpent cipher algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -496,7 +467,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SERPENT
 	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
 
 config ADK_KPACKAGE_KMOD_CRYPTO_TEA
-	prompt "kmod-crypto-tea...................... TEA, XTEA and XETA cipher algorithms"
+	prompt "TEA, XTEA and XETA cipher algorithms"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -515,7 +486,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_TEA
 	  of the XTEA algorithm for compatibility purposes.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_TWOFISH
-	prompt "kmod-crypto-twofish.................. Twofish cipher algorithm"
+	prompt "Twofish cipher algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	default n
@@ -531,7 +502,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_TWOFISH
 	  <http://www.schneier.com/twofish.html>
 
 config ADK_KPACKAGE_KMOD_CRYPTO_TWOFISH_586
-	prompt "kmod-crypto-twofish-586.............. Twofish cipher algorithm (i586)"
+	prompt "Twofish cipher algorithm (i586)"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	depends on ADK_x86
@@ -548,7 +519,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_TWOFISH_586
 	  <http://www.schneier.com/twofish.html>
 
 config ADK_KPACKAGE_KMOD_CRYPTO_NULL
-	prompt "kmod-crypto-null..................... Null algorithms"
+	prompt "Null algorithms"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
@@ -561,7 +532,7 @@ endmenu
 menu "Compression"
 
 config ADK_KPACKAGE_KMOD_CRYPTO_DEFLATE
-	prompt "kmod-crypto-deflate.................. Deflate compression algorithm"
+	prompt "Deflate compression algorithm"
 	tristate
 	select ADK_KERNEL_CRYPTO
 	default n
@@ -572,14 +543,14 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEFLATE
 	  You will most probably want this if using IPSec.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_LZO
-	prompt "kmod-crypto-lzo...................... LZO compression algorithm"
+	prompt "LZO compression algorithm"
 	tristate
 	select ADK_KERNEL_CRYPTO
 	default n
 	help
 
 config ADK_KPACKAGE_KMOD_CRYPTO_MICHAEL_MIC
-	prompt "kmod-crypto-michael-mic.............. Michael MIC keyed digest algorithm"
+	prompt "Michael MIC keyed digest algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI2
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
@@ -591,7 +562,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_MICHAEL_MIC
 	  of the algorithm.
 
 config ADK_KPACKAGE_KMOD_CRYPTO_CRC32C
-	prompt "kmod-crypto-crc32c................... CRC32c CRC algorithm"
+	prompt "CRC32c CRC algorithm"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH2
 	select ADK_KPACKAGE_KMOD_LIBCRC32C
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index 0acbd7cf3..0bf761bd4 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -3,12 +3,12 @@ config ADK_KERNEL_DMADEVICES
 
 config ADK_KERNEL_IMX_SDMA
 	boolean
+	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_KERNEL_DMADEVICES
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_FIRMWARE_IN_KERNEL
 	select ADK_KERNEL_FW_LOADER_USER_HELPER
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 
 config ADK_KERNEL_CMA
diff --git a/target/linux/config/Config.in.gpio b/target/linux/config/Config.in.gpio
index cdb8ca923..414a4b0ce 100644
--- a/target/linux/config/Config.in.gpio
+++ b/target/linux/config/Config.in.gpio
@@ -8,8 +8,8 @@ config ADK_KERNEL_GPIO_GENERIC
 	boolean
 
 config ADK_KERNEL_GPIO_MXC
+	boolean
 	select ADK_KERNEL_GPIOLIB
 	select ADK_KERNEL_GPIO_SYSFS
 	select ADK_KERNEL_GPIO_GENERIC
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
-	boolean
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index cb2ba0c4b..5bd34cf9d 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -113,7 +113,7 @@ config ADK_KERNEL_FB_CON_DECOR
 	default n
 
 config ADK_KERNEL_FB_VESA
-	prompt "................................ Framebuffer support for VirtualBox Emulator (VESA)"
+	prompt "Framebuffer support for VirtualBox Emulator (VESA)"
 	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
@@ -124,8 +124,8 @@ config ADK_KERNEL_FB_VESA
 	 Framebuffer support for VirtualBox Emulator.
 
 config ADK_KERNEL_DRM_IMX
-	prompt "................................ Framebuffer support for Cubox-i"
-	tristate
+	prompt "Framebuffer support for Cubox-i (IMX)"
+	boolean
 	select ADK_KERNEL_DRM
 	select ADK_KERNEL_DMA_CMA
 	select ADK_KERNEL_RESET_CONTROLLER
@@ -147,8 +147,8 @@ config ADK_KERNEL_DRM_IMX
 	 Framebuffer support for Cubox-i.
 
 config ADK_KERNEL_FB_PXA
-	prompt "................................ Framebuffer support for Sharp Zaurus"
-	tristate
+	prompt "Framebuffer support for Sharp Zaurus (PXA)"
+	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -158,8 +158,8 @@ config ADK_KERNEL_FB_PXA
 	 Framebuffer support for Sharp Zaurus CL Series.
 
 config ADK_KERNEL_FB_GEODE_LX
-	prompt "................................ Framebuffer support for ALIX boards with VGA"
-	tristate
+	prompt "Framebuffer support for ALIX boards (GEODE)"
+	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FB_GEODE
@@ -170,8 +170,8 @@ config ADK_KERNEL_FB_GEODE_LX
 	 Framebuffer support for ALIX boards with VGA.
 
 config ADK_KERNEL_FB_SM7XX
-	prompt "................................ Framebuffer support for Lemote Yeelong"
-	tristate
+	prompt "Framebuffer support for Lemote Yeelong (SM7XX)"
+	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FONT_8x16
@@ -183,7 +183,7 @@ config ADK_KERNEL_FB_SM7XX
 	 Framebuffer support for Lemote Yeelong.
 
 config ADK_KERNEL_FB_BCM2708
-	prompt "................................ Framebuffer support for Raspberry PI"
+	prompt "Framebuffer support for Raspberry PI"
 	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
@@ -195,7 +195,7 @@ config ADK_KERNEL_FB_BCM2708
 	 Framebuffer support for Raspberry PI.
 
 config ADK_HARDWARE_GRAPHICS_INTEL_I915
-	prompt "............................ Support for Intel graphic cards (AGP/DRM/KMS/NM10)"
+	prompt "Support for Intel graphic cards (AGP/DRM/KMS/NM10)"
 	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_DRM
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index 8b67aca72..eee17ee8c 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -8,23 +8,23 @@ menu "I2C driver support"
 depends on ADK_TARGET_WITH_I2C
 
 config ADK_KERNEL_I2C_IMX
-	prompt ".................................. I2C driver for cubox-i"
+	prompt "I2C driver for Cubox-i"
 	boolean
+	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_KERNEL_I2C
 	select ADK_KERNEL_I2C_CHARDEV
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
-	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	help
 	  I2C driver for cubox-i.
 	
 config ADK_KPACKAGE_KMOD_SCx200_ACB
-	prompt "kmod-i2c-geode.................... I2C driver for Geode"
+	prompt "I2C driver for Geode"
 	tristate
+	depends on ADK_CPU_GEODE
 	select ADK_KERNEL_I2C
 	select ADK_KERNEL_I2C_CHARDEV
 	default n
-	depends on ADK_CPU_GEODE
 	help
 	  I2C driver for Geode boards.
  
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 629b0576f..2dad34d1f 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -111,7 +111,7 @@ menu "Input devices"
 depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN
 
 config ADK_KPACKAGE_KMOD_USB_HID
-	prompt "kmod-usb-hid..................... USB keyboard/mouse support"
+	prompt "USB keyboard/mouse support"
 	tristate
 	depends on !ADK_KERNEL_USB_HID
 	select ADK_KERNEL_INPUT
@@ -126,7 +126,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	default n
 
 config ADK_KERNEL_LOGITECH_DINOVO
-	prompt "................................. Support for Logitech DiNovo keyboard/mouse"
+	prompt "Support for Logitech DiNovo keyboard/mouse"
 	boolean
 	select ADK_KERNEL_HID_LOGITECH
 	select ADK_KERNEL_HID_LOGITECH_DJ
@@ -135,7 +135,7 @@ config ADK_KERNEL_LOGITECH_DINOVO
 	  Support for Logitech DiNovo keyboard/mouse combination.
 
 config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
-	prompt "kmod-input-keyboard.............. Keyboard support (AT)"
+	prompt "Keyboard support (AT)"
 	tristate
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
@@ -144,14 +144,14 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
-	prompt "kmod-input-mouse................. Mouse support"
+	prompt "Mouse support"
 	tristate
 	select ADK_KERNEL_INPUT
 	depends on !ADK_KERNEL_INPUT_MOUSEDEV
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_EVDEV
-	prompt "kmod-input-evdev................. Event support"
+	prompt "Event device support"
 	tristate
 	select ADK_KERNEL_INPUT
 	depends on !ADK_KERNEL_INPUT_EVDEV
diff --git a/target/linux/config/Config.in.ipsec b/target/linux/config/Config.in.ipsec
index 04bad1f09..b8fd67926 100644
--- a/target/linux/config/Config.in.ipsec
+++ b/target/linux/config/Config.in.ipsec
@@ -1,20 +1,20 @@
 menu "IPSec support"
 
 config ADK_KPACKAGE_KMOD_NET_KEY
-	prompt "kmod-net-key..................... PF_KEYv2 socket family"
+	prompt "PF_KEYv2 socket family"
 	tristate
 	default n
 	help
 	  PF_KEYv2 socket family, compatible to KAME ones.
 
 config ADK_KPACKAGE_KMOD_XFRM_USER
-	prompt "kmod-xfrm-user.................... IPsec usertools support"
+	prompt "IPsec usertools support"
 	tristate
 	default n
 	help
 
 config ADK_KPACKAGE_KMOD_INET_AH
-	prompt "kmod-inet-ah...................... IPsec AH support"
+	prompt "IPsec AH support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH
 	default n
@@ -22,7 +22,7 @@ config ADK_KPACKAGE_KMOD_INET_AH
 	  Support for IPsec AH.
 
 config ADK_KPACKAGE_KMOD_INET_ESP
-	prompt "kmod-inet-esp..................... IPsec ESP support"
+	prompt "IPsec ESP support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_AEAD
 	default n
@@ -30,7 +30,7 @@ config ADK_KPACKAGE_KMOD_INET_ESP
 	  Support for IPsec ESP.
 
 config ADK_KPACKAGE_KMOD_INET_IPCOMP
-	prompt "kmod-inet-ipcomp.................. IP Payload Compression"
+	prompt "IP Payload Compression"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRYPTO_DEFLATE
 	select ADK_KPACKAGE_KMOD_INET_TUNNEL
@@ -40,23 +40,24 @@ config ADK_KPACKAGE_KMOD_INET_IPCOMP
 	  typically needed for IPsec.
 
 config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT
-	prompt "kmod-inet-xfrm-mode-transport..... IPsec transport mode"
+	prompt "IPsec transport mode"
 	tristate
 	default n
 	help
 	  Support for IPsec transport mode.
 
 config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL
-	prompt "kmod-inet-xfrm-mode-tunnel........ IPsec tunnel mode"
+	prompt "IPsec tunnel mode"
 	tristate
 	default n
 	help
 	  Support for IPsec tunnel mode.
 
 config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_BEET
-	prompt "kmod-inet-xfrm-mode-beet.......... IPsec BEET mode"
+	prompt "IPsec BEET mode"
 	tristate
 	default n
 	help
 	  Support for IPsec BEET mode.
+
 endmenu
diff --git a/target/linux/config/Config.in.ipvs b/target/linux/config/Config.in.ipvs
index b7ed817b6..13e38ece3 100644
--- a/target/linux/config/Config.in.ipvs
+++ b/target/linux/config/Config.in.ipvs
@@ -1,7 +1,7 @@
 menu "IPVS support"
 
 config ADK_KPACKAGE_KMOD_IP_VS
-	prompt "kmod-ip-vs............................ IPVS support"
+	prompt "IPVS support"
 	tristate
 	select ADK_KERNEL_NETFILTER
 	select ADK_KPACKAGE_KMOD_NF_CONNTRACK
@@ -54,52 +54,52 @@ menu "IPVS Scheduler"
 	depends on ADK_KPACKAGE_KMOD_IP_VS
 
 config ADK_KPACKAGE_KMOD_IP_VS_RR
-	prompt "kmod-ip-vs-rr......................... round-robin"
+	prompt "round-robin"
 	tristate
 	default n
 
 config ADK_KPACKAGE_KMOD_IP_VS_WRR
-	prompt "kmod-ip-vs-wrr........................ weighted round-robin"
+	prompt "weighted round-robin"
 	tristate
 	default n
 
 config ADK_KPACKAGE_KMOD_IP_VS_LC
-	prompt "kmod-ip-vs-lc......................... least-connection"
+	prompt "least-connection"
 	tristate
 	default n
 
 config ADK_KPACKAGE_KMOD_IP_VS_WLC
-	prompt "kmod-ip-vs-wlc........................ weighted least-connection"
+	prompt "weighted least-connection"
 	tristate
 	default n
 
 config ADK_KPACKAGE_KMOD_IP_VS_LBLC
-	prompt "kmod-ip-vs-lblc....................... locality-based least-connection"
+	prompt "locality-based least-connection"
 	tristate
 	default n
 
 config ADK_KPACKAGE_KMOD_IP_VS_LBLCR
-	prompt "kmod-ip-vs-lblcr...................... locality-based least-connection with replication"
+	prompt "locality-based least-connection with replication"
 	tristate
 	default n
 
 config ADK_KPACKAGE_KMOD_IP_VS_DH
-	prompt "kmod-ip-vs-dh......................... destination hashing"
+	prompt "destination hashing"
 	tristate
 	default n
 
 config ADK_KPACKAGE_KMOD_IP_VS_SH
-	prompt "kmod-ip-vs-sh......................... source hashing"
+	prompt "source hashing"
 	tristate
 	default n
 
 config ADK_KPACKAGE_KMOD_IP_VS_SED
-	prompt "kmod-ip-vs-sed........................ shortest expected delay"
+	prompt "shortest expected delay"
 	tristate
 	default n
 
 config ADK_KPACKAGE_KMOD_IP_VS_NQ
-	prompt "kmod-ip-vs-nq......................... never queue"
+	prompt "never queue"
 	tristate
 	default n
 
@@ -109,11 +109,10 @@ menu "IPVS application helper"
 	depends on ADK_KPACKAGE_KMOD_IP_VS
 
 config ADK_KPACKAGE_KMOD_IP_VS_FTP
-	prompt "kmod-ip-vs-ftp........................ FTP protocol"
+	prompt "FTP protocol"
 	tristate
 	default n
 	select ADK_KERNEL_IP_VS_PROTO_TCP
 
 endmenu
-
 endmenu
diff --git a/target/linux/config/Config.in.isdn b/target/linux/config/Config.in.isdn
deleted file mode 100644
index 6dc0d1349..000000000
--- a/target/linux/config/Config.in.isdn
+++ /dev/null
@@ -1,37 +0,0 @@
-menu "ISDN"
-depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
-
-config ADK_KERNEL_ISDN
-	boolean
-
-config ADK_KERNEL_ISDN_I4L
-	boolean
-
-config ADK_KERNEL_ISDN_DRV_AVMB1_VERBOSE_REASON
-	boolean
-
-config ADK_KERNEL_CAPI_AVM
-	boolean
-
-config ADK_KERNEL_CAPI_EICON
-	boolean
-
-config ADK_KERNEL_HFCMULTI_PCIMEM
-	boolean
-
-config ADK_KERNEL_ISDN_CAPI_MIDDLEWARE
-	boolean
-
-config ADK_KERNEL_ISDN_CAPI_CAPI20
-	tristate
-
-config ADK_KPACKAGE_KMOD_ISDN_CAPI
-	prompt "kmod-isdn-capi.................... Support for CAPI 2.0"
-	tristate
-	select ADK_KERNEL_ISDN_CAPI_CAPI20
-	select ADK_KERNEL_ISDN
-	default n
-	help
-	 Kernel support for CAPI 2.0 and /dev/capi20
-
-endmenu
diff --git a/target/linux/config/Config.in.lib b/target/linux/config/Config.in.lib
index 9bed11261..07dfbcf3d 100644
--- a/target/linux/config/Config.in.lib
+++ b/target/linux/config/Config.in.lib
@@ -1,4 +1,4 @@
-menu "Library Rou