style changes, boolean -> bool, no prompt where not strictly required

17 files changed, 256 insertions, 420 deletions

diff --git a/target/linux/config/Config.in.aufs b/target/linux/config/Config.in.aufs
index 228a23e52..033270fdc 100644
--- a/target/linux/config/Config.in.aufs
+++ b/target/linux/config/Config.in.aufs
@@ -17,7 +17,7 @@ config ADK_KERNEL_AUFS_FS
 if ADK_KERNEL_AUFS_FS
 
 choice 
-	boolean "Maximum number of branches"
+	bool "Maximum number of branches"
 	default ADK_KERNEL_AUFS_BRANCH_MAX_127
 	help
 	  Specifies the maximum number of branches (or member directories)
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 9b676c14c..964478607 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -7,7 +7,7 @@ config ADK_KERNEL_CRYPTO
 	tristate
 
 config ADK_KERNEL_CRYPTO_HW
-	boolean
+	bool
 
 config ADK_KERNEL_XOR_BLOCKS
 	tristate
@@ -18,8 +18,7 @@ menu "Hardware crypto devices"
 depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_GEODE_CRYPTO
 
 config ADK_KERNEL_CRYPTO_DEV_GEODE
-	prompt "Support for the Geode LX/GX AES engine"
-	tristate
+	tristate "Support for the Geode LX/GX AES engine"
 	select ADK_KERNEL_CRYPTO
 	select ADK_KERNEL_CRYPTO_HW
 	select ADK_KERNEL_CRYPTO_ECB
@@ -32,8 +31,7 @@ config ADK_KERNEL_CRYPTO_DEV_GEODE
 	  engine for the CryptoAPI AES algorithm.
 
 config ADK_KERNEL_CRYPTO_DEV_HIFN_795X
-	prompt "Driver for HIFN 795x crypto accelerator chips"
-	tristate
+	tristate "Driver for HIFN 795x crypto accelerator chips"
 	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_MINIPCI
 	select ADK_KERNEL_CRYPTO
 	select ADK_KERNEL_CRYPTO_HW
@@ -120,8 +118,7 @@ config ADK_KERNEL_CRYPTO_MANAGER2
 	select ADK_KERNEL_CRYPTO_PCOMP2
 
 config ADK_KERNEL_CRYPTO_AUTHENC
-	prompt "AuthENC (IPsec)"
-	tristate
+	tristate "AuthENC (IPsec)"
 	select ADK_KERNEL_CRYPTO_AEAD
 	select ADK_KERNEL_CRYPTO_BLKCIPHER
 	select ADK_KERNEL_CRYPTO_MANAGER
@@ -129,8 +126,7 @@ config ADK_KERNEL_CRYPTO_AUTHENC
 	default n
 
 config ADK_KERNEL_CRYPTO_SEQIV
-	prompt "Sequence Number IV Generator"
-	tristate
+	tristate "Sequence Number IV Generator"
 	select ADK_KERNEL_CRYPTO_AEAD
 	select ADK_KERNEL_CRYPTO_BLKCIPHER
 	select ADK_KERNEL_CRYPTO_RNG
@@ -140,8 +136,7 @@ config ADK_KERNEL_CRYPTO_SEQIV
 	  xoring it with a salt.  This algorithm is mainly useful for CTR
 
 config ADK_KERNEL_CRYPTO_CTS
-	prompt "CTS support"
-	tristate
+	tristate "CTS support"
 	select ADK_KERNEL_CRYPTO_BLKCIPHER
 	default n
 	help
@@ -153,8 +148,7 @@ config ADK_KERNEL_CRYPTO_CTS
           for AES encryption.
 
 config ADK_KERNEL_CRYPTO_CBC
-	prompt "CBC support"
-	tristate
+	tristate "CBC support"
 	select ADK_KERNEL_CRYPTO_BLKCIPHER
 	select ADK_KERNEL_CRYPTO_MANAGER
 	default n
@@ -163,8 +157,7 @@ config ADK_KERNEL_CRYPTO_CBC
 	  This block cipher algorithm is required for IPSec.
 
 config ADK_KERNEL_CRYPTO_CCM
-	prompt "CCM support"
-	tristate
+	tristate "CCM support"
 	select ADK_KERNEL_CRYPTO_CTR
 	select ADK_KERNEL_CRYPTO_AEAD
 	default n
@@ -172,8 +165,7 @@ config ADK_KERNEL_CRYPTO_CCM
 	  Support for Counter with CBC MAC. Required for IPsec.
 
 config ADK_KERNEL_CRYPTO_GCM
-	prompt "GCM support"
-	tristate
+	tristate "GCM support"
 	select ADK_KERNEL_CRYPTO_CTR
 	select ADK_KERNEL_CRYPTO_AEAD
 	select ADK_KERNEL_CRYPTO_GHASH
@@ -184,8 +176,7 @@ config ADK_KERNEL_CRYPTO_GCM
           Authentication Code (GMAC). Required for IPSec.
 
 config ADK_KERNEL_CRYPTO_CTR
-	prompt "CTR support"
-	tristate
+	tristate "CTR support"
 	select ADK_KERNEL_CRYPTO_BLKCIPHER
 	select ADK_KERNEL_CRYPTO_SEQIV
 	select ADK_KERNEL_CRYPTO_MANAGER
@@ -195,8 +186,7 @@ config ADK_KERNEL_CRYPTO_CTR
 	  This block cipher algorithm is required for IPSec.
 
 config ADK_KERNEL_CRYPTO_ECB
-	prompt "ECB support"
-	tristate
+	tristate "ECB support"
 	select ADK_KERNEL_CRYPTO_BLKCIPHER
 	select ADK_KERNEL_CRYPTO_MANAGER
 	default n
@@ -206,8 +196,7 @@ config ADK_KERNEL_CRYPTO_ECB
 	  the input block by block.
 
 config ADK_KERNEL_CRYPTO_HMAC
-	prompt "HMAC support"
-	tristate
+	tristate "HMAC support"
 	select ADK_KERNEL_CRYPTO_HASH
 	select ADK_KERNEL_CRYPTO_MANAGER
 	default n
@@ -216,8 +205,7 @@ config ADK_KERNEL_CRYPTO_HMAC
 	  This is required for IPSec.
 
 config ADK_KERNEL_CRYPTO_XCBC
-	prompt "XCBC support"
-	tristate
+	tristate "XCBC support"
 	select ADK_KERNEL_CRYPTO_HASH
 	select ADK_KERNEL_CRYPTO_MANAGER
 	default n
@@ -229,32 +217,28 @@ endmenu
 menu "Digest algorithms"
 
 config ADK_KERNEL_CRYPTO_MD4
-	prompt "MD4 digest algorithm"
-	tristate
+	tristate "MD4 digest algorithm"
 	select ADK_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  MD4 message digest algorithm (RFC1320).
 
 config ADK_KERNEL_CRYPTO_MD5
-	prompt "MD5 digest algorithm"
-	tristate
+	tristate "MD5 digest algorithm"
 	select ADK_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  MD5 message digest algorithm (RFC1321).
 
 config ADK_KERNEL_CRYPTO_SHA1
-	prompt "SHA1 digest algorithm"
-	tristate
+	tristate "SHA1 digest algorithm"
 	select ADK_KERNEL_CRYPTO_HASH
 	default n
 	help
 	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
 
 config ADK_KERNEL_CRYPTO_SHA256
-	prompt "SHA256 digest algorithm"
-	tristate
+	tristate "SHA256 digest algorithm"
 	select ADK_KERNEL_CRYPTO_HASH
 	default n
 	help
@@ -264,8 +248,7 @@ config ADK_KERNEL_CRYPTO_SHA256
 	  security against collision attacks.
 
 config ADK_KERNEL_CRYPTO_SHA512
-	prompt "SHA512 digest algorithm"
-	tristate
+	tristate "SHA512 digest algorithm"
 	select ADK_KERNEL_CRYPTO_HASH
 	default n
 	help
@@ -278,8 +261,7 @@ config ADK_KERNEL_CRYPTO_SHA512
 	  of security against collision attacks.
 
 config ADK_KERNEL_CRYPTO_WP512
-	prompt "Whirlpool digest algorithms"
-	tristate
+	tristate "Whirlpool digest algorithms"
 	select ADK_KERNEL_CRYPTO_HASH
 	default n
 	help
@@ -292,8 +274,7 @@ config ADK_KERNEL_CRYPTO_WP512
 	  <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
 
 config ADK_KERNEL_CRYPTO_TGR192
-	prompt "Tiger digest algorithms"
-	tristate
+	tristate "Tiger digest algorithms"
 	select ADK_KERNEL_CRYPTO_HASH
 	default n
 	help
@@ -310,8 +291,7 @@ endmenu
 menu "Cipher algoritms"
 
 config ADK_KERNEL_CRYPTO_AES
-	prompt "AES cipher algorithms"
-	tristate
+	tristate "AES cipher algorithms"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -332,8 +312,7 @@ config ADK_KERNEL_CRYPTO_AES
 	  See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information.
 
 config ADK_KERNEL_CRYPTO_AES_586
-	prompt "AES cipher algorithms (i586)"
-	tristate
+	tristate "AES cipher algorithms (i586)"
 	depends on ADK_x86
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	select ADK_KERNEL_CRYPTO_AES
@@ -356,8 +335,7 @@ config ADK_KERNEL_CRYPTO_AES_586
 	  See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information.
 
 config ADK_KERNEL_CRYPTO_ANUBIS
-	prompt "Anubis cipher algorithm"
-	tristate
+	tristate "Anubis cipher algorithm"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -372,8 +350,7 @@ config ADK_KERNEL_CRYPTO_ANUBIS
 	  <http://planeta.terra.com.br/informatica/paulobarreto/AnubisPage.html>
 
 config ADK_KERNEL_CRYPTO_ARC4
-	prompt "ARC4 cipher algorithm"
-	tristate
+	tristate "ARC4 cipher algorithm"
 	select ADK_KERNEL_CRYPTO_BLKCIPHER
 	default n
 	help
@@ -385,8 +362,7 @@ config ADK_KERNEL_CRYPTO_ARC4
 	  weakness of the algorithm.
 
 config ADK_KERNEL_CRYPTO_BLOWFISH
-	prompt "Blowfish cipher algorithm"
-	tristate
+	tristate "Blowfish cipher algorithm"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -400,8 +376,7 @@ config ADK_KERNEL_CRYPTO_BLOWFISH
 	  <http://www.schneier.com/blowfish.html>
 
 config ADK_KERNEL_CRYPTO_CAMELLIA
-	prompt "Camellia cipher algorithms"
-	tristate
+	tristate "Camellia cipher algorithms"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -416,8 +391,7 @@ config ADK_KERNEL_CRYPTO_CAMELLIA
 	  <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
 
 config ADK_KERNEL_CRYPTO_CAST5
-	prompt "CAST5 (CAST-128) cipher algorithm"
-	tristate
+	tristate "CAST5 (CAST-128) cipher algorithm"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -425,8 +399,7 @@ config ADK_KERNEL_CRYPTO_CAST5
 	  described in RFC2144.
 
 config ADK_KERNEL_CRYPTO_CAST6
-	prompt "CAST6 (CATS-256) cipher algorithm"
-	tristate
+	tristate "CAST6 (CATS-256) cipher algorithm"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -434,24 +407,21 @@ config ADK_KERNEL_CRYPTO_CAST6
 	  described in RFC2612.
 
 config ADK_KERNEL_CRYPTO_DES
-	prompt "DES and Triple DES EDE cipher algorithms"
-	tristate
+	tristate "DES and Triple DES EDE cipher algorithms"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
 config ADK_KERNEL_CRYPTO_FCRYPT
-	prompt "FCrypt cipher algorithms"
-	tristate
+	tristate "FCrypt cipher algorithms"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 	  FCrypt algorithm used by RxRPC.
 
 config ADK_KERNEL_CRYPTO_KHAZAD
-	prompt "Khazad cipher algorithm"
-	tristate
+	tristate "Khazad cipher algorithm"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -465,8 +435,7 @@ config ADK_KERNEL_CRYPTO_KHAZAD
 	  <http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html>
 
 config ADK_KERNEL_CRYPTO_SERPENT
-	prompt "Serpent cipher algorithm"
-	tristate
+	tristate "Serpent cipher algorithm"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -480,8 +449,7 @@ config ADK_KERNEL_CRYPTO_SERPENT
 	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
 
 config ADK_KERNEL_CRYPTO_TEA
-	prompt "TEA, XTEA and XETA cipher algorithms"
-	tristate
+	tristate "TEA, XTEA and XETA cipher algorithms"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -499,8 +467,7 @@ config ADK_KERNEL_CRYPTO_TEA
 	  of the XTEA algorithm for compatibility purposes.
 
 config ADK_KERNEL_CRYPTO_TWOFISH
-	prompt "Twofish cipher algorithm"
-	tristate
+	tristate "Twofish cipher algorithm"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
@@ -515,8 +482,7 @@ config ADK_KERNEL_CRYPTO_TWOFISH
 	  <http://www.schneier.com/twofish.html>
 
 config ADK_KERNEL_CRYPTO_TWOFISH_586
-	prompt "Twofish cipher algorithm (i586)"
-	tristate
+	tristate "Twofish cipher algorithm (i586)"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	depends on ADK_x86
 	default n
@@ -532,8 +498,7 @@ config ADK_KERNEL_CRYPTO_TWOFISH_586
 	  <http://www.schneier.com/twofish.html>
 
 config ADK_KERNEL_CRYPTO_NULL
-	prompt "Null algorithms"
-	tristate
+	tristate "Null algorithms"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	select ADK_KERNEL_CRYPTO_BLKCIPHER
 	select ADK_KERNEL_CRYPTO_HASH
@@ -546,8 +511,7 @@ endmenu
 menu "Compression"
 
 config ADK_KERNEL_CRYPTO_DEFLATE
-	prompt "Deflate compression algorithm"
-	tristate
+	tristate "Deflate compression algorithm"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	select ADK_KERNEL_ZLIB_DEFLATE
 	select ADK_KERNEL_ZLIB_INFLATE
@@ -559,15 +523,13 @@ config ADK_KERNEL_CRYPTO_DEFLATE
 	  You will most probably want this if using IPSec.
 
 config ADK_KERNEL_CRYPTO_LZO
-	prompt "LZO compression algorithm"
-	tristate
+	tristate "LZO compression algorithm"
 	select ADK_KERNEL_CRYPTO_ALGAPI
 	default n
 	help
 
 config ADK_KERNEL_CRYPTO_MICHAEL_MIC
-	prompt "Michael MIC keyed digest algorithm"
-	tristate
+	tristate "Michael MIC keyed digest algorithm"
 	select ADK_KERNEL_CRYPTO_HASH
 	default n
 	help
@@ -577,8 +539,7 @@ config ADK_KERNEL_CRYPTO_MICHAEL_MIC
 	  of the algorithm.
 
 config ADK_KERNEL_CRYPTO_CRC32C
-	prompt "CRC32c CRC algorithm"
-	tristate
+	tristate "CRC32c CRC algorithm"
 	select ADK_KERNEL_CRYPTO_HASH
 	select ADK_KERNEL_CRC32
 	default n
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index b0929aa40..e44814cb3 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -6,71 +6,70 @@ depends on ADK_TARGET_WITH_NAND || ADK_TARGET_WITH_MTD || ADK_TARGET_QEMU
 
 config ADK_KERNEL_MTD
 	select ADK_KERNEL_GENERIC_IO
- 	boolean
+ 	bool
 
 config ADK_KERNEL_GENERIC_IO
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_MTDRAM
-	boolean
+	bool
  
 config ADK_KERNEL_MTD_NAND
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_NAND_PLATFORM
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_CHAR
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_BLKDEVS
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_BLOCK
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_PARTITIONS
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_ROOTFS_ROOT_DEV
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_CFI
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_GEN_PROBE
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_PHYSMAP
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_PHYSMAP_OF
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_CFI_ADV_OPTIONS
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_NAND_RB4XX
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_AR7_PARTS
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_CFI_INTELEXT
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_CFI_AMDSTD
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_CFI_STAA
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_OF_PARTS
-	boolean
+	bool
 
 config ADK_KERNEL_MTD_M25P80
-	prompt "MTD M25P80 driver"
-	boolean
+	bool "MTD M25P80 driver"
 	select ADK_KERNEL_MTD
 	select ADK_KERNEL_MTD_PARTITIONS
 	select ADK_KERNEL_MTD_CHAR
@@ -90,8 +89,7 @@ config ADK_KERNEL_MTD_M25P80
 	default n
 
 config ADK_KERNEL_MTD_NAND_PLATFORM
-	prompt "NAND platform driver"
-	boolean
+	bool "NAND platform driver"
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_MTD
 	select ADK_KERNEL_MTD_PARTITIONS
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 45b904ced..71c098167 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -5,172 +5,168 @@ menu "Graphic devices support"
 depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU || ADK_TARGET_VBOX
 
 config ADK_KERNEL_VT
-	boolean
+	bool
 	default y if ADK_TARGET_WITH_VGA
 	default y if ADK_TARGET_VBOX
 	default n
 
 config ADK_KERNEL_VT_CONSOLE
-	boolean
+	bool
 	default y if ADK_TARGET_WITH_VGA
 	default y if ADK_TARGET_VBOX
 	default n
 
 config ADK_KERNEL_VGA_CONSOLE
-	boolean
+	bool
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_VBOX
 	default n
 
 config ADK_KERNEL_FONTS
-	boolean
+	bool
 
 config ADK_KERNEL_FONT_8x16
-	boolean
+	bool
 	select ADK_KERNEL_FONTS
 
 config ADK_KERNEL_FB
 	select ADK_KERNEL_VT
 	select ADK_KERNEL_VT_CONSOLE
- 	boolean
+ 	bool
 
 config ADK_KERNEL_FB_SBUS
 	bool
 
 config ADK_KERNEL_DUMMY_CONSOLE
-	boolean
+	bool
  
 config ADK_KERNEL_FRAMEBUFFER_CONSOLE
-	boolean
+	bool
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 
 config ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
-	boolean
+	bool
 
 config ADK_KERNEL_FRAMEBUFFER_CONSOLE_ROTATION
-	boolean
+	bool
 
 config ADK_KERNEL_FB_MXC
- 	boolean
+ 	bool
 
 config ADK_KERNEL_FB_MXC_LDB
- 	boolean
+ 	bool
 
 config ADK_KERNEL_FB_MXC_SYNC_PANEL
-	boolean
+	bool
 
 config ADK_KERNEL_FB_MXC_HDMI
- 	boolean
+ 	bool
 
 config ADK_KERNEL_FB_MXC_EDID
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_IPU
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_IPU_V3
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_VPU
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_GPU_VIV
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_GPU_VIV_V4
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_ASRC
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_HDMI_CEC
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_MIPI_CSI2
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_MLB
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MXC_MLB150
- 	boolean
+ 	bool
 
 config ADK_KERNEL_MFD_SM501
-	boolean
+	bool
 
 config ADK_KERNEL_FB_ATARI
-	boolean
+	bool
 	select ADK_KERNEL_FB
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 
 config ADK_KERNEL_FB_ARMCLCD
-	boolean
+	bool
 
 config ADK_KERNEL_PLAT_VERSATILE_CLCD
-	boolean
+	bool
 	select ADK_KERNEL_FB_ARMCLCD
 
 config ADK_KERNEL_FB_CIRRUS
-	boolean
+	bool
 
 config ADK_KERNEL_FB_GEODE
-	boolean
+	bool
 
 config ADK_KERNEL_FB_SM501
-	boolean
+	bool
 	select ADK_KERNEL_MFD_SM501
 
 config ADK_KERNEL_DRM
-	boolean
+	bool
 
 config ADK_KERNEL_DRM_I915
-	boolean
+	bool
 
 config ADK_KERNEL_DRM_I915_KMS
-	boolean
+	bool
 
 config ADK_KERNEL_DRM_I915_FBDEV
-	boolean
+	bool
 
 config ADK_KERNEL_AGP
-	boolean
+	bool
 
 config ADK_KERNEL_AGP_INTEL
-	boolean
+	bool
 
 config ADK_KERNEL_LOGO
-	boolean
+	bool
  
 config ADK_KERNEL_LOGO_LINUX_CLUT224
-	prompt "Enable Linux penguin boot logo"
-	boolean
+	bool "Enable Linux penguin boot logo"
 	select ADK_KERNEL_LOGO
 	default n
 
 config ADK_KERNEL_FB_CON_DECOR
-	prompt "Enable fullscreen boot logo"
-	boolean
+	bool "Enable fullscreen boot logo"
 	select ADK_PACKAGE_FBSPLASH
 	depends on ADK_TARGET_KERNEL_VERSION_3_18 || \
 		   ADK_TARGET_KERNEL_VERSION_3_14
 	default n
 
 config ADK_KERNEL_FB_VESA
-	prompt "Framebuffer support for VirtualBox Emulator (VESA)"
-	boolean
+	bool "Framebuffer support for VirtualBox Emulator (VESA)"
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	default y if ADK_TARGET_VBOX
  	default n
 	depends on ADK_TARGET_VBOX
  	help
-	 Framebuffer support for VirtualBox Emulator.
+	  Framebuffer support for VirtualBox Emulator.
 
 config ADK_KERNEL_MXC_GPU_VIV
-	prompt "Framebuffer support for Cubox-i/Hummingboard (Vivante)"
-	boolean
+	bool "Framebuffer support for Cubox-i/Hummingboard (Vivante)"
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FB_MXC
 	select ADK_KERNEL_FB_MXC_LDB
@@ -195,8 +191,7 @@ config ADK_KERNEL_MXC_GPU_VIV
 	  Framebuffer support for Cubox-i/Hummingboard (Vivante)
 	
 config ADK_KERNEL_FB_PXA
-	prompt "Framebuffer support for Sharp Zaurus (PXA)"
-	boolean
+	bool "Framebuffer support for Sharp Zaurus (PXA)"
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_DUMMY_CONSOLE
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
@@ -209,11 +204,10 @@ config ADK_KERNEL_FB_PXA
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
  	default n
  	help
-	 Framebuffer support for Sharp Zaurus CL Series.
+	  Framebuffer support for Sharp Zaurus CL Series.
 
 config ADK_KERNEL_FB_GEODE_LX
-	prompt "Framebuffer support for ALIX boards (GEODE)"
-	boolean
+	bool "Framebuffer support for ALIX boards (GEODE)"
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FB_GEODE
@@ -221,11 +215,10 @@ config ADK_KERNEL_FB_GEODE_LX
 	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
  	default n
  	help
-	 Framebuffer support for ALIX boards with VGA.
+	  Framebuffer support for ALIX boards with VGA.
 
 config ADK_KERNEL_FB_SM7XX
-	prompt "Framebuffer support for Lemote Yeelong (SM7XX)"
-	boolean
+	bool "Framebuffer support for Lemote Yeelong (SM7XX)"
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FONT_8x16
@@ -234,11 +227,10 @@ config ADK_KERNEL_FB_SM7XX
  	default n
 	depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG
  	help
-	 Framebuffer support for Lemote Yeelong.
+	  Framebuffer support for Lemote Yeelong.
 
 config ADK_KERNEL_FB_BCM2708
-	prompt "Framebuffer support for BCM2835 boards"
-	boolean
+	bool "Framebuffer support for BCM2835 boards"
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FONT_8x16
@@ -246,11 +238,10 @@ config ADK_KERNEL_FB_BCM2708
  	default n
 	depends on ADK_TARGET_BOARD_BCM28XX
  	help
-	 Framebuffer support for BCM2835 boards.
+	  Framebuffer support for BCM2835 boards.
 
 config ADK_HARDWARE_GRAPHICS_INTEL_I915
-	prompt "Support for Intel graphic cards (AGP/DRM/KMS)"
-	boolean
+	bool "Support for Intel graphic cards (AGP/DRM/KMS)"
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_DRM
 	select ADK_KERNEL_AGP
@@ -266,8 +257,7 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915
           AGP/DRM/KMS support for Intel chipset i915.
 
 config ADK_KERNEL_DRM_CIRRUS_QEMU
-	prompt "Support for QEMU cirrus VGA emulation (DRM/KMS)"
-	boolean
+	bool "Support for QEMU cirrus VGA emulation (DRM/KMS)"
 	select ADK_KERNEL_DRM
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	depends on ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
diff --git a/target/linux/config/Config.in.ipvs b/target/linux/config/Config.in.ipvs
index ce332329b..310ff44e9 100644
--- a/target/linux/config/Config.in.ipvs
+++ b/target/linux/config/Config.in.ipvs
@@ -4,48 +4,42 @@
 menu "IPVS support"
 
 config ADK_KERNEL_IP_VS
-	prompt "IPVS support"
-	tristate
+	tristate "IPVS support"
 	select ADK_KERNEL_NETFILTER
 	select ADK_KERNEL_NF_CONNTRACK
 	default n
 
 config ADK_KERNEL_IP_VS_DEBUG
-	prompt "enable debugging support"
-	boolean
-	default n
+	bool "enable debugging support"
 	depends on ADK_KERNEL_IP_VS
+	default n
 
 menu "IPVS transport protocol load balancing support"
 	depends on ADK_KERNEL_IP_VS
 
 config ADK_KERNEL_IP_VS_PROTO_TCP
-	prompt "TCP load balancing support"
-	boolean
+	bool "TCP load balancing support"
 	default n
 	help
 	  This option enables support for load balancing TCP transport
 	  protocol. Say Y if unsure.
 
 config ADK_KERNEL_IP_VS_PROTO_UDP
-	prompt "UDP load balancing support"
-	boolean
+	bool "UDP load balancing support"
 	default n
 	help
 	  This option enables support for load balancing UDP transport
 	  protocol. Say Y if unsure.
 
 config ADK_KERNEL_IP_VS_PROTO_ESP
-	prompt "ESP load balancing support"
-	boolean
+	bool "ESP load balancing support"
 	default n
 	help
 	  This option enables support for load balancing ESP (Encapsulation
 	  Security Payload) transport protocol. Say Y if unsure.
 
 config ADK_KERNEL_IP_VS_PROTO_AH
-	prompt "AH load balancing support"
-	boolean
+	bool "AH load balancing support"
 	default n
 	help
 	  This option enables support for load balancing AH (Authentication
@@ -57,53 +51,43 @@ menu "IPVS Scheduler"
 	depends on ADK_KERNEL_IP_VS
 
 config ADK_KERNEL_IP_VS_RR
-	prompt "round-robin"
-	tristate
+	tristate "round-robin"
 	default n
 
 config ADK_KERNEL_IP_VS_WRR
-	prompt "weighted round-robin"
-	tristate
+	tristate "weighted round-robin"
 	default n
 
 config ADK_KERNEL_IP_VS_LC
-	prompt "least-connection"
-	tristate
+	tristate "least-connection"
 	default n
 
 config ADK_KERNEL_IP_VS_WLC
-	prompt "weighted least-connection"
-	tristate
+	tristate "weighted least-connection"
 	default n
 
 config ADK_KERNEL_IP_VS_LBLC
-	prompt "locality-based least-connection"
-	tristate
+	tristate "locality-based least-connection"
 	default n
 
 config ADK_KERNEL_IP_VS_LBLCR
-	prompt "locality-based least-connection with replication"
-	tristate
+	tristate "locality-based least-connection with replication"
 	default n
 
 config ADK_KERNEL_IP_VS_DH
-	prompt "destination hashing"
-	tristate
+	tristate "destination hashing"
 	default n
 
 config ADK_KERNEL_IP_VS_SH
-	prompt "source hashing"
-	tristate
+	tristate "source hashing"
 	default n
 
 config ADK_KERNEL_IP_VS_SED
-	prompt "shortest expected delay"
-	tristate
+	tristate "shortest expected delay"
 	default n
 
 config ADK_KERNEL_IP_VS_NQ
-	prompt "never queue"
-	tristate
+	tristate "never queue"
 	default n
 
 endmenu
@@ -112,10 +96,9 @@ menu "IPVS application helper"
 	depends on ADK_KERNEL_IP_VS
 
 config ADK_KERNEL_IP_VS_FTP
-	prompt "FTP protocol"
-	tristate
-	default n
+	tristate "FTP protocol"
 	select ADK_KERNEL_IP_VS_PROTO_TCP
+	default n
 
 endmenu
 endmenu
diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm
index a45b88846..7ed2e5385 100644
--- a/target/linux/config/Config.in.kvm
+++ b/target/linux/config/Config.in.kvm
@@ -9,8 +9,7 @@ config ADK_KERNEL_VIRTUALIZATION
 	default n
 
 config ADK_KERNEL_KVM
-	prompt "Kernel-based Virtual Machine (KVM) support"
-	tristate
+	tristate "Kernel-based Virtual Machine (KVM) support"
 	select ADK_KERNEL_VIRTUALIZATION
 	default n
 	help
@@ -22,8 +21,7 @@ config ADK_KERNEL_KVM
 	  a character device node named /dev/kvm.
 
 config ADK_KERNEL_KVM_AMD
-	prompt "KVM for AMD processors support"
-	tristate
+	tristate "KVM for AMD processors support"
 	select ADK_KERNEL_VIRTUALIZATION
 	default n
 	help
@@ -31,8 +29,7 @@ config ADK_KERNEL_KVM_AMD
 	  (SVM) extensions.
 
 config ADK_KERNEL_KVM_INTEL
-	prompt "KVM for Intel processors support"
-	tristate
+	tristate "KVM for Intel processors support"
 	select ADK_KERNEL_VIRTUALIZATION
 	default n
 	help
diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds
index 371ecfb8a..4c143a563 100644
--- a/target/linux/config/Config.in.leds
+++ b/target/linux/config/Config.in.leds
@@ -2,70 +2,63 @@
 # material, please see the LICENCE file in the top-level directory.
 
 config ADK_KERNEL_NEW_LEDS
-	boolean
+	bool
 
 config ADK_KERNEL_LEDS_CLASS
-	boolean
+	bool
 	select ADK_KERNEL_NEW_LEDS
 
 config ADK_KERNEL_LEDS_TRIGGERS
-	boolean
+	bool
 	select ADK_KERNEL_NEW_LEDS
 
 config ADK_KERNEL_LEDS_CLASS
-	boolean
+	bool
 
 menu "LEDS driver support"
 depends on ADK_TARGET_WITH_LEDS
 
 config ADK_KERNEL_LEDS_MIKROTIK_RB532
-	prompt "LED suppport for RB532"
-	tristate
+	tristate "LED suppport for RB532"
 	select ADK_KERNEL_LEDS_CLASS
 	depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default n
 
 config ADK_KERNEL_LEDS_WRAP
-	prompt "LED suppport for WRAP"
-	tristate
+	tristate "LED suppport for WRAP"
 	select ADK_KERNEL_LEDS_CLASS
 	depends on ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default n
 
 config ADK_KERNEL_LEDS_ALIX2
-	prompt "LED suppport for ALIX2/ALIX3"
-	tristate
+	tristate "LED suppport for ALIX2/ALIX3"
 	select ADK_KERNEL_LEDS_CLASS
 	depends on ADK_TARGET_MODEL_PCENGINES_ALIX2D
 	default y if ADK_TARGET_MODEL_PCENGINES_ALIX2D
 	default n
 
 config ADK_KERNEL_LEDS_TRIGGER_TIMER
-	prompt "LED Timer trigger"
-	tristate
+	tristate "LED Timer trigger"
 	select ADK_KERNEL_LEDS_TRIGGERS
 	select ADK_KERNEL_LEDS_CLASS
 	default n
 
 config ADK_KERNEL_LEDS_TRIGGER_HEARTBEAT
-	prompt "LED Heartbeat trigger"
-	tristate
+	tristate "LED Heartbeat trigger"
 	select ADK_KERNEL_LEDS_TRIGGERS
 	select ADK_KERNEL_LEDS_CLASS
 	default n
 
 config ADK_KERNEL_LEDS_TRIGGER_DEFAULT_ON
-	prompt "LED Default On trigger"
-	tristate
+	tristate "LED Default On trigger"
 	select ADK_KERNEL_LEDS_TRIGGERS
 	select ADK_KERNEL_LEDS_CLASS
 	default n
 
 config ADK_KERNEL_NETFILTER_XT_TARGET_LED
-	prompt "LED IPTables trigger"
-	tristate
+	tristate "LED IPTables trigger"
 	select ADK_KERNEL_LEDS_TRIGGERS
 	select ADK_KERNEL_LEDS_CLASS
 	select ADK_PACKAGE_IPTABLES
diff --git a/target/linux/config/Config.in.lib b/target/linux/config/Config.in.lib
index b8ba7ad38..a2ccf9f4e 100644
--- a/target/linux/config/Config.in.lib
+++ b/target/linux/config/Config.in.lib
@@ -4,8 +4,7 @@
 menu "Kernel Library Routines"
 
 config ADK_KERNEL_CRC_ITU_T
-	prompt "CRC ITU-T V.41 functions"
-	tristate
+	tristate "CRC ITU-T V.41 functions"
 	default n
 	help
 	  This option is provided for the case where no in-kernel-tree
@@ -14,20 +13,17 @@ config ADK_KERNEL_CRC_ITU_T
 	  functions require M here.
 
 config ADK_KERNEL_CRC16
-	prompt "CRC16 library functions"
-	boolean
+	tristate "CRC16 library functions"
 	default n
 	help
 
 config ADK_KERNEL_CRC32
-	prompt "CRC32 library functions"
-	boolean