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
+	bool "CRC32 library functions"
 	default n
 	help
 
 config ADK_KERNEL_LIBCRC32C
-	prompt "CRC32c Cyclic Redundancy-Check"
-	tristate
+	tristate "CRC32c Cyclic Redundancy-Check"
 	default n
 	help
 	  This option is provided for the case where no in-kernel-tree
@@ -36,8 +32,7 @@ config ADK_KERNEL_LIBCRC32C
 	  require M here.  See Castagnoli93.
 
 config ADK_KERNEL_CRC_CCITT
-	prompt "CRC-CCITT library functions"
-	tristate
+	tristate "CRC-CCITT library functions"
 	default n
 	help
 	  This module provides CRC-CCITT library functions for kernel 
@@ -45,18 +40,14 @@ config ADK_KERNEL_CRC_CCITT
 
 config ADK_KERNEL_ZLIB_DEFLATE
 	tristate
-	default n
 
 config ADK_KERNEL_ZLIB_INFLATE
 	tristate
-	default n
 
 config ADK_KERNEL_LZO_COMPRESS
 	tristate
-	default n
 
 config ADK_KERNEL_LZO_DECOMPRESS
 	tristate
-	default n
 
 endmenu
diff --git a/target/linux/config/Config.in.netfilter.ip6 b/target/linux/config/Config.in.netfilter.ip6
index 077ae82f9..a72c3a318 100644
--- a/target/linux/config/Config.in.netfilter.ip6
+++ b/target/linux/config/Config.in.netfilter.ip6
@@ -2,8 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 config ADK_KERNEL_NF_CONNTRACK_IPV6
-	prompt "IPv6 connection tracking support"
-	tristate
+	tristate "IPv6 connection tracking support"
 	select ADK_KERNEL_NF_CONNTRACK
 	select ADK_KERNEL_IPV6
 	default n
diff --git a/target/linux/config/Config.in.nls b/target/linux/config/Config.in.nls
index 96f672d2f..437cef79c 100644
--- a/target/linux/config/Config.in.nls
+++ b/target/linux/config/Config.in.nls
@@ -8,8 +8,7 @@ config ADK_KERNEL_NLS_DEFAULT
 	default "utf-8"
 
 config ADK_KERNEL_NLS_CODEPAGE_437
-	prompt "Codepage 437 (United States, Canada)"
-	tristate
+	tristate "Codepage 437 (United States, Canada)"
 	default n
 	help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -22,8 +21,7 @@ config ADK_KERNEL_NLS_CODEPAGE_437
 	  the United States and parts of Canada. This is recommended.
 
 config ADK_KERNEL_NLS_CODEPAGE_737
-	prompt "Codepage 737 (Greek)"
-	tristate
+	tristate "Codepage 737 (Greek)"
 	default n
 	help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -36,8 +34,7 @@ config ADK_KERNEL_NLS_CODEPAGE_737
 	  Greek. If unsure, say N.
 
 config ADK_KERNEL_NLS_CODEPAGE_775
-	prompt "Codepage 775 (Baltic Rim)"
-	tristate
+	tristate "Codepage 775 (Baltic Rim)"
 	default n
 	help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -51,8 +48,7 @@ config ADK_KERNEL_NLS_CODEPAGE_775
 	  say N.
 
 config ADK_KERNEL_NLS_CODEPAGE_850
-	prompt "Codepage 850 (Western European Languages)"
-	tristate
+	tristate "Codepage 850 (Western European Languages)"
 	default n
 	help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -67,8 +63,7 @@ config ADK_KERNEL_NLS_CODEPAGE_850
 	  languages that are not part of the US codepage 437.
 
 config ADK_KERNEL_NLS_CODEPAGE_852
-        prompt "Codepage 852 (Eastern European Languages)"
-        tristate
+        tristate "Codepage 852 (Eastern European Languages)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -84,8 +79,7 @@ config ADK_KERNEL_NLS_CODEPAGE_852
 	  transcription), Slovak, Slovenian, and Sorbian.
 
 config ADK_KERNEL_NLS_CODEPAGE_855
-        prompt "Codepage 855 (Cyrillic)"
-        tristate
+        tristate "Codepage 855 (Cyrillic)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -97,8 +91,7 @@ config ADK_KERNEL_NLS_CODEPAGE_855
 	  say Y here if you want to include the DOS codepage for Cyrillic.
 
 config ADK_KERNEL_NLS_CODEPAGE_857
-        prompt "Codepage 857 (Turkish)"
-        tristate
+        tristate "Codepage 857 (Turkish)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -110,8 +103,7 @@ config ADK_KERNEL_NLS_CODEPAGE_857
 	  say Y here if you want to include the DOS codepage for Turkish.
 
 config ADK_KERNEL_NLS_CODEPAGE_860
-        prompt "Codepage 860 (Portuguese)"
-        tristate
+        tristate "Codepage 860 (Portuguese)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -123,8 +115,7 @@ config ADK_KERNEL_NLS_CODEPAGE_860
 	  say Y here if you want to include the DOS codepage for Portuguese.
 
 config ADK_KERNEL_NLS_CODEPAGE_861
-        prompt "Codepage 861 (Icelandic)"
-        tristate
+        tristate "Codepage 861 (Icelandic)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -136,8 +127,7 @@ config ADK_KERNEL_NLS_CODEPAGE_861
 	  say Y here if you want to include the DOS codepage for Icelandic.
 
 config ADK_KERNEL_NLS_CODEPAGE_862
-        prompt "Codepage 862 (Hebrew)"
-        tristate
+        tristate "Codepage 862 (Hebrew)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -149,8 +139,7 @@ config ADK_KERNEL_NLS_CODEPAGE_862
 	  say Y here if you want to include the DOS codepage for Hebrew.
 
 config ADK_KERNEL_NLS_CODEPAGE_863
-        prompt "Codepage 863 (French Canadian)"
-        tristate
+        tristate "Codepage 863 (French Canadian)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -163,8 +152,7 @@ config ADK_KERNEL_NLS_CODEPAGE_863
 	  French.
 
 config ADK_KERNEL_NLS_CODEPAGE_864
-        prompt "Codepage 864 (Arabic)"
-        tristate
+        tristate "Codepage 864 (Arabic)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -176,8 +164,7 @@ config ADK_KERNEL_NLS_CODEPAGE_864
 	  say Y here if you want to include the DOS codepage for Arabic.
 
 config ADK_KERNEL_NLS_CODEPAGE_865
-        prompt "Codepage 865 (Norwegian, Danish)"
-        tristate
+        tristate "Codepage 865 (Norwegian, Danish)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -190,8 +177,7 @@ config ADK_KERNEL_NLS_CODEPAGE_865
 	  European countries.
 
 config ADK_KERNEL_NLS_CODEPAGE_866
-        prompt "Codepage 866 (Cyrillic/Russian)"
-        tristate
+        tristate "Codepage 866 (Cyrillic/Russian)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -204,8 +190,7 @@ config ADK_KERNEL_NLS_CODEPAGE_866
 	  Cyrillic/Russian.
 
 config ADK_KERNEL_NLS_CODEPAGE_869
-        prompt "Codepage 869 (Greek)"
-        tristate
+        tristate "Codepage 869 (Greek)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -217,8 +202,7 @@ config ADK_KERNEL_NLS_CODEPAGE_869
 	  say Y here if you want to include the DOS codepage for Greek.
 
 config ADK_KERNEL_NLS_CODEPAGE_874
-        prompt "Codepage 874 (Thai)"
-        tristate
+        tristate "Codepage 874 (Thai)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -230,8 +214,7 @@ config ADK_KERNEL_NLS_CODEPAGE_874
 	  say Y here if you want to include the DOS codepage for Thai.
 
 config ADK_KERNEL_NLS_CODEPAGE_932
-        prompt "Codepage 932 (Japanese)"
-        tristate
+        tristate "Codepage 932 (Japanese)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -245,8 +228,7 @@ config ADK_KERNEL_NLS_CODEPAGE_932
 	  NLS Default value during kernel configuration, instead of 'cp932'.
 
 config ADK_KERNEL_NLS_CODEPAGE_936
-        prompt "Codepage 936 (Simplified Chinese)"
-        tristate
+        tristate "Codepage 936 (Simplified Chinese)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -259,8 +241,7 @@ config ADK_KERNEL_NLS_CODEPAGE_936
 	  Chinese(GBK).
 
 config ADK_KERNEL_NLS_CODEPAGE_949
-        prompt "Codepage 949 (Korean)"
-        tristate
+        tristate "Codepage 949 (Korean)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -272,8 +253,7 @@ config ADK_KERNEL_NLS_CODEPAGE_949
 	  say Y here if you want to include the DOS codepage for UHC.
 
 config ADK_KERNEL_NLS_CODEPAGE_950
-        prompt "Codepage 950 (Traditional Chinese)"
-        tristate
+        tristate "Codepage 950 (Traditional Chinese)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -286,8 +266,7 @@ config ADK_KERNEL_NLS_CODEPAGE_950
 	  Chinese(Big5).
 
 config ADK_KERNEL_NLS_CODEPAGE_1250
-        prompt "Codepage 1250 (Slavic/Central European)"
-        tristate
+        tristate "Codepage 1250 (Slavic/Central European)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -299,8 +278,7 @@ config ADK_KERNEL_NLS_CODEPAGE_1250
 	  Slovak, Slovene.
 
 config ADK_KERNEL_NLS_CODEPAGE_1251
-        prompt "Codepage 1251 (Bulgarian, Belarusian)"
-        tristate
+        tristate "Codepage 1251 (Bulgarian, Belarusian)"
         default n
         help
 	  The Microsoft FAT file system family can deal with filenames in
@@ -313,8 +291,7 @@ config ADK_KERNEL_NLS_CODEPAGE_1251
 	  Bulgarian and Belarusian.
 
 config ADK_KERNEL_NLS_ASCII
-	prompt "ASCII (United States)"
-	tristate
+	tristate "ASCII (United States)"
 	default n
 	help
 	  An ASCII NLS module is needed if you want to override the
@@ -322,8 +299,7 @@ config ADK_KERNEL_NLS_ASCII
 	  non-ASCII characters to be translated.
 
 config ADK_KERNEL_NLS_ISO8859_1
-	prompt "NLS ISO 8859-1 (Latin-1; Western European Languages)"
-	tristate
+	tristate "NLS ISO 8859-1 (Latin-1; Western European Languages)"
 	default n
 	help
 	  If you want to display filenames with native language characters
@@ -336,8 +312,7 @@ config ADK_KERNEL_NLS_ISO8859_1
 	  and Swedish. It is also the default for the US. If unsure, say Y.
 
 config ADK_KERNEL_NLS_ISO8859_2
-        prompt "NLS ISO 8859-2 (Latin-2; Central European Languages)"
-        tristate
+        tristate "NLS ISO 8859-2 (Latin-2; Central European Languages)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -349,8 +324,7 @@ config ADK_KERNEL_NLS_ISO8859_2
 	  Slovak, Slovene.
 
 config ADK_KERNEL_NLS_ISO8859_3
-        prompt "NLS ISO 8859-3 (Latin-3; Esperanto, Galician, Maltese, Turkish)"
-        tristate
+        tristate "NLS ISO 8859-3 (Latin-3; Esperanto, Galician, Maltese, Turkish)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -361,8 +335,7 @@ config ADK_KERNEL_NLS_ISO8859_3
 	  and Turkish.
 
 config ADK_KERNEL_NLS_ISO8859_4
-        prompt "NLS ISO 8859-4 (Latin-4; old Baltic charset)"
-        tristate
+        tristate "NLS ISO 8859-4 (Latin-4; old Baltic charset)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -373,8 +346,7 @@ config ADK_KERNEL_NLS_ISO8859_4
 	  Lithuanian. It is an incomplete predecessor of Latin 7.
 
 config ADK_KERNEL_NLS_ISO8859_5
-        prompt "NLS ISO 8859-5 (Cyrillic)"
-        tristate
+        tristate "NLS ISO 8859-5 (Cyrillic)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -386,8 +358,7 @@ config ADK_KERNEL_NLS_ISO8859_5
 	  KOI8-R is preferred in Russia.
 
 config ADK_KERNEL_NLS_ISO8859_6
-        prompt "NLS ISO 8859-6 (Arabic)"
-        tristate
+        tristate "NLS ISO 8859-6 (Arabic)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -397,8 +368,7 @@ config ADK_KERNEL_NLS_ISO8859_6
 	  character set.
 
 config ADK_KERNEL_NLS_ISO8859_7
-        prompt "NLS ISO 8859-7 (Greek)"
-        tristate
+        tristate "NLS ISO 8859-7 (Greek)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -408,8 +378,7 @@ config ADK_KERNEL_NLS_ISO8859_7
 	  Greek character set.
 
 config ADK_KERNEL_NLS_ISO8859_8
-        prompt "NLS ISO 8859-8 (Hebrew)"
-        tristate
+        tristate "NLS ISO 8859-8 (Hebrew)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -419,8 +388,7 @@ config ADK_KERNEL_NLS_ISO8859_8
 	  character set.
 
 config ADK_KERNEL_NLS_ISO8859_9
-        prompt "NLS ISO 8859-9 (Latin-5; Turkish)"
-        tristate
+        tristate "NLS ISO 8859-9 (Latin-5; Turkish)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -431,8 +399,7 @@ config ADK_KERNEL_NLS_ISO8859_9
 	  with the Turkish ones. Useful in Turkey.
 
 config ADK_KERNEL_NLS_ISO8859_13
-        prompt "NLS ISO 8859-13 (Latin-7; Baltic Rim)"
-        tristate
+        tristate "NLS ISO 8859-13 (Latin-7; Baltic Rim)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -443,8 +410,7 @@ config ADK_KERNEL_NLS_ISO8859_13
 	  and Lithuanian.
 
 config ADK_KERNEL_NLS_ISO8859_14
-        prompt "NLS ISO 8859-14 (Latin-8; Celtic)"
-        tristate
+        tristate "NLS ISO 8859-14 (Latin-8; Celtic)"
         default n
         help
 	  If you want to display filenames with native language characters
@@ -456,8 +422,7 @@ config ADK_KERNEL_NLS_ISO8859_14
 	  <http://linux.speech.cymru.org/> has further information.
 
 config ADK_KERNEL_NLS_ISO8859_15
-	prompt "NLS ISO 8859-15 (Latin-9; Western European Languages with Euro)"
-	tristate
+	tristate "NLS ISO 8859-15 (Latin-9; Western European Languages with Euro)"
 	default n
 	help
 	  If you want to display filenames with native language characters
@@ -474,8 +439,7 @@ config ADK_KERNEL_NLS_ISO8859_15
 	  If unsure, say Y.
 
 config ADK_KERNEL_NLS_KOI8_R
-	prompt "NLS KOI8-R (Cryllic for Russian and Bulgarian)"
-	tristate
+	tristate "NLS KOI8-R (Cryllic for Russian and Bulgarian)"
 	default n
 	help
 	  If you want to display filenames with native language characters
@@ -485,8 +449,7 @@ config ADK_KERNEL_NLS_KOI8_R
 	  character set.
 
 config ADK_KERNEL_NLS_KOI8_U
-	prompt "NLS KOI8-U (Cyrillic for Russian, Bulgarian and Ukrainian)"
-	tristate
+	tristate "NLS KOI8-U (Cyrillic for Russian, Bulgarian and Ukrainian)"
 	default n
 	help
 	  If you want to display filenames with native language characters
@@ -496,8 +459,7 @@ config ADK_KERNEL_NLS_KOI8_U
 	  (koi8-u) and Belarusian (koi8-ru) character sets.
 
 config ADK_KERNEL_NLS_UTF8
-	prompt "NLS UTF8"
-	tristate
+	tristate "NLS UTF8"
 	default n
 	help
 	  If you want to display filenames with native language characters
diff --git a/target/linux/config/Config.in.pcmcia b/target/linux/config/Config.in.pcmcia
index 27c8ab100..bb40d8274 100644
--- a/target/linux/config/Config.in.pcmcia
+++ b/target/linux/config/Config.in.pcmcia
@@ -5,29 +5,27 @@ menu "PCMCIA/CardBus support"
 depends on ADK_TARGET_WITH_CARDBUS || ADK_TARGET_WITH_PCMCIA || ADK_TARGET_QEMU
 
 config ADK_KERNEL_CARDBUS
-	boolean 
+	bool 
 
 config ADK_KERNEL_PCMCIA_PROBE
-	boolean
+	bool
 
 config ADK_KERNEL_SERIAL_8250_EXTENDED
-	boolean
+	bool
 
 config ADK_KERNEL_SERIAL_8250_SHARE_IRQ
-	boolean
+	bool
 	select ADK_KERNEL_SERIAL_8250_EXTENDED
 
 config ADK_KERNEL_PCMCIA_PXA2XX
-	boolean
+	bool
 
 config ADK_KERNEL_PCCARD
-	prompt "PCCARD support"
-	tristate
+	tristate "PCCARD support"
 	default n
 
 config ADK_KERNEL_PCMCIA
-	prompt "16-bit PCMCIA support"
-	tristate
+	tristate "16-bit PCMCIA support"
 	depends on ADK_KERNEL_PCCARD
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_CRC32
@@ -35,18 +33,16 @@ config ADK_KERNEL_PCMCIA
 	default n
 
 config ADK_KERNEL_YENTA
-	prompt "32-bit CardBus support"
-	tristate
+	tristate "32-bit CardBus support"
 	depends on ADK_KERNEL_PCCARD
 	depends on ADK_TARGET_WITH_CARDBUS
 	select ADK_KERNEL_CARDBUS
 	default n
 
 config ADK_KERNEL_SERIAL_8250_CS
-	prompt "PCMCIA/CardBus serial device support"
-	tristate
-	default n
+	tristate "PCMCIA/CardBus serial device support"
 	select ADK_KERNEL_SERIAL_8250_SHARE_IRQ
 	depends on ADK_KERNEL_PCMCIA && !ADK_TARGET_QEMU
+	default n
 
 endmenu
diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm
index c0a84b645..7ed913fd9 100644
--- a/target/linux/config/Config.in.pm
+++ b/target/linux/config/Config.in.pm
@@ -34,8 +34,7 @@ menu "Power Management support"
 depends on ADK_TARGET_WITH_ACPI || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 
 config ADK_HARDWARE_ACPI
-	prompt "Enable ACPI support"
-	bool
+	bool "Enable ACPI support"
 	select ADK_KERNEL_PM
 	select ADK_KERNEL_PM_RUNTIME
 	select ADK_KERNEL_ACPI
@@ -52,8 +51,7 @@ config ADK_HARDWARE_ACPI
 	 Enable ACPI support.
 
 config ADK_KERNEL_SUSPEND
-	prompt "Enable Suspend-to-RAM support"
-	bool
+	bool "Enable Suspend-to-RAM support"
 	select ADK_KERNEL_PM
 	select ADK_KERNEL_PM_RUNTIME
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -63,8 +61,7 @@ config ADK_KERNEL_SUSPEND
 	  Enable Suspend-to-RAM support.
 
 config ADK_KERNEL_HIBERNATION
-	prompt "Enable Suspend-to-Disk support"
-	bool
+	bool "Enable Suspend-to-Disk support"
 	select ADK_KERNEL_PM
 	select ADK_KERNEL_PM_RUNTIME
 	select ADK_KERNEL_SWAP
diff --git a/target/linux/config/Config.in.rtc b/target/linux/config/Config.in.rtc
index 6adecfa63..45b416c92 100644
--- a/target/linux/config/Config.in.rtc
+++ b/target/linux/config/Config.in.rtc
@@ -5,20 +5,19 @@ menu "RTC device support"
 depends on ADK_TARGET_WITH_RTC
 
 config ADK_KERNEL_RTC_CLASS
- 	boolean
+ 	bool
 
 config ADK_KERNEL_RTC_HCTOSYS
- 	boolean
+ 	bool
 
 config ADK_KERNEL_RTC_INTF_DEV
- 	boolean
+ 	bool
 
 config ADK_KERNEL_RTC_INTF_DEV_UIE_EMUL
-	boolean
+	bool
 
 config ADK_KERNEL_RTC_DRV_PCF8523
-	prompt "RTC support for Solidrun IMX6 (PCF8523)"
-	boolean
+	bool "RTC support for Solidrun IMX6 (PCF8523)"
 	select ADK_KERNEL_RTC_CLASS
 	select ADK_KERNEL_RTC_HCTOSYS
 	select ADK_KERNEL_RTC_INTF_DEV
@@ -30,8 +29,7 @@ config ADK_KERNEL_RTC_DRV_PCF8523
 	  PCF8523 RTC.
 
 config ADK_KERNEL_RTC_DRV_PXA
-	prompt "RTC support for Sharp Zaurus"
-	boolean
+	bool "RTC support for Sharp Zaurus"
 	select ADK_KERNEL_RTC_CLASS
 	select ADK_KERNEL_RTC_HCTOSYS
 	select ADK_KERNEL_RTC_INTF_DEV
@@ -42,8 +40,7 @@ config ADK_KERNEL_RTC_DRV_PXA
 	  Sharp Zaurus RTC.
 
 config ADK_KERNEL_RTC_DRV_AT91SAM9
-	prompt "RTC support for AT91SAM9 (Fox G20)"
-	boolean
+	bool "RTC support for AT91SAM9 (Fox G20)"
 	select ADK_KERNEL_RTC_CLASS
 	select ADK_KERNEL_RTC_HCTOSYS
 	select ADK_KERNEL_RTC_INTF_DEV
@@ -54,8 +51,7 @@ config ADK_KERNEL_RTC_DRV_AT91SAM9
  	  Fox G20 RTC support.
 
 config ADK_KERNEL_RTC_DRV_CMOS
-	prompt "RTC support for PC CMOS"
-	boolean
+	bool "RTC support for PC CMOS"
 	select ADK_KERNEL_RTC_CLASS
 	select ADK_KERNEL_RTC_HCTOSYS
 	select ADK_KERNEL_RTC_INTF_DEV
@@ -65,6 +61,6 @@ config ADK_KERNEL_RTC_DRV_CMOS
  	default n
 	depends on (ADK_TARGET_MODEL_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
  	help
-	 PC CMOS RTC support.
+	  PC CMOS RTC support.
 
 endmenu
diff --git a/target/linux/config/Config.in.sched b/target/linux/config/Config.in.sched
index 26c432314..76bd9751c 100644
--- a/target/linux/config/Config.in.sched
+++ b/target/linux/config/Config.in.sched
@@ -4,24 +4,19 @@
 menu "QoS and/or fair queueing"
 
 config ADK_KERNEL_NET_SCH_CSZ
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_NET_SCH_NETEM
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_NET_QOS
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_NET_ESTIMATOR
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_NET_SCHED
-	boolean
-	default n
+	bool
 	help
 	  When the kernel has several packets to send out over a network
 	  device, it has to decide which ones to send first, which ones to
@@ -52,8 +47,7 @@ config ADK_KERNEL_NET_SCHED
 comment "Queueing/Scheduling"
 
 config ADK_KERNEL_NET_SCH_CBQ
-	prompt "Class Based Queueing (CBQ)"
-	tristate
+	tristate "Class Based Queueing (CBQ)"
 	select ADK_KERNEL_NET_SCHED
 	default n
 	help
@@ -69,8 +63,7 @@ config ADK_KERNEL_NET_SCH_CBQ
 	  want to use as leaf disciplines.
 
 config ADK_KERNEL_NET_SCH_HTB
-	prompt "Hierarchical Token Bucket (HTB)"
-	tristate
+	tristate "Hierarchical Token Bucket (HTB)"
 	select ADK_KERNEL_NET_SCHED
 	default n
 	help
@@ -83,8 +76,7 @@ config ADK_KERNEL_NET_SCH_HTB
 	  different properties and different algorithm.
 
 config ADK_KERNEL_NET_SCH_HFSC
-	prompt "Hierarchical Fair Service Curve (HFSC)"
-	tristate
+	tristate "Hierarchical Fair Service Curve (HFSC)"
 	select ADK_KERNEL_NET_SCHED
 	default n
 	help
@@ -92,8 +84,7 @@ config ADK_KERNEL_NET_SCH_HFSC
 	  (HFSC) packet scheduling algorithm.
 
 config ADK_KERNEL_NET_SCH_ATM
-	prompt "ATM Virtual Circuits (ATM)"
-	tristate
+	tristate "ATM Virtual Circuits (ATM)"
 	depends on ADK_KERNEL_ATM
 	select ADK_KERNEL_NET_SCHED
 	default n
@@ -106,8 +97,7 @@ config ADK_KERNEL_NET_SCH_ATM
 	  See the top of <file:net/sched/sch_atm.c>) for more details.
 
 config ADK_KERNEL_NET_SCH_PRIO
-	prompt "Multi Band Priority Queueing (PRIO)"
-	tristate
+	tristate "Multi Band Priority Queueing (PRIO)"
 	select ADK_KERNEL_NET_SCHED
 	default n
 	help
@@ -115,8 +105,7 @@ config ADK_KERNEL_NET_SCH_PRIO
 	  scheduler.
 
 config ADK_KERNEL_NET_SCH_RED
-	prompt "Random Early Detection (RED)"
-	tristate
+	tristate "Random Early Detection (RED)"
 	select ADK_KERNEL_NET_SCHED
 	default n
 	help
@@ -126,8 +115,7 @@ config ADK_KERNEL_NET_SCH_RED
 	  See the top of <file:net/sched/sch_red.c> for more details.
 
 config ADK_KERNEL_NET_SCH_SFQ
-	prompt "Stochastic Fairness Queueing (SFQ)"
-	tristate
+	tristate "Stochastic Fairness Queueing (SFQ)"
 	select ADK_KERNEL_NET_SCHED
 	default n
 	help
@@ -137,8 +125,7 @@ config ADK_KERNEL_NET_SCH_SFQ
 	  See the top of <file:net/sched/sch_sfq.c> for more details.
 
 config ADK_KERNEL_NET_SCH_TBF
-	prompt "Token Bucket Filter (TBF)"
-	tristate
+	tristate "Token Bucket Filter (TBF)"
 	select ADK_KERNEL_NET_SCHED
 	default n
 	help
@@ -148,8 +135,7 @@ config ADK_KERNEL_NET_SCH_TBF
 	  See the top of <file:net/sched/sch_tbf.c> for more details.
 
 config ADK_KERNEL_NET_SCH_GRED
-	prompt "Generic Random Early Detection (GRED)"
-	tristate
+	tristate "Generic Random Early Detection (GRED)"
 	select ADK_KERNEL_NET_SCHED
 	default n
 	help
@@ -159,8 +145,7 @@ config ADK_KERNEL_NET_SCH_GRED
 	  references about the algorithm).
 
 config ADK_KERNEL_NET_SCH_DSMARK
-	prompt "Differentiated Services marker (DSMARK)"
-	tristate
+	tristate "Differentiated Services marker (DSMARK)"
 	select ADK_KERNEL_NET_SCHED
 	default n
 	help
@@ -170,8 +155,7 @@ config ADK_KERNEL_NET_SCH_DSMARK
 	  RFCs, is available at <http://www.gta.ufrj.br/diffserv/>.
 
 config ADK_KERNEL_NET_SCH_INGRESS
-	prompt "Ingress Qdisc"
-	tristate
+	tristate "Ingress Qdisc"
 	select ADK_KERNEL_NET_SCHED
 	select ADK_KERNEL_NETFILTER
 	select ADK_KERNEL_NET_CLS_ACT
@@ -183,13 +167,12 @@ config ADK_KERNEL_NET_SCH_INGRESS
 comment "Classification"
 
 config ADK_KERNEL_NET_CLS
-	boolean
+	bool
 	select ADK_KERNEL_NET_SCHED
 	default n
 
 config ADK_KERNEL_NET_CLS_BASIC
-	prompt "Elementary classification (BASIC)"
-	tristate
+	tristate "Elementary classification (BASIC)"
 	select ADK_KERNEL_NET_CLS
 	default n
 	help
@@ -197,8 +180,7 @@ config ADK_KERNEL_NET_CLS_BASIC
 	  only extended matches and actions.
 
 config ADK_KERNEL_NET_CLS_TCINDEX
-	prompt "Traffic-Control Index (TCINDEX)"
-	tristate
+	tristate "Traffic-Control Index (TCINDEX)"
 	select ADK_KERNEL_NET_CLS
 	default n
 	help
@@ -207,8 +189,7 @@ config ADK_KERNEL_NET_CLS_TCINDEX
 	  to implement Differentiated Services together with DSMARK.
 
 config ADK_KERNEL_NET_CLS_ROUTE4
-	prompt "Routing decision (ROUTE)"
-	tristate
+	tristate "Routing decision (ROUTE)"
 	select ADK_KERNEL_NET_CLS
 	default n
 	help
@@ -216,8 +197,7 @@ config ADK_KERNEL_NET_CLS_ROUTE4
 	  according to the route table entry they matched.
 
 config ADK_KERNEL_NET_CLS_FW
-	prompt "Netfilter mark (FW)"
-	tristate
+	tristate "Netfilter mark (FW)"
 	select ADK_KERNEL_NET_CLS
 	default n
 	help
@@ -225,8 +205,7 @@ config ADK_KERNEL_NET_CLS_FW
 	  according to netfilter/firewall marks.
 
 config ADK_KERNEL_NET_CLS_U32
-	prompt "Universal 32bit comparisons w/ hashing (U32)"
-	tristate
+	tristate "Universal 32bit comparisons w/ hashing (U32)"
 	select ADK_KERNEL_NET_CLS
 	default n
 	help
@@ -234,8 +213,7 @@ config ADK_KERNEL_NET_CLS_U32
 	  32bit pieces based comparison scheme.
 
 config ADK_KERNEL_NET_CLS_U32_PERF
-	prompt "Performance counters support"
-	bool
+	bool "Performance counters support"
 	select ADK_KERNEL_NET_CLS
 	depends on ADK_KERNEL_NET_CLS_U32
 	default n
@@ -244,8 +222,7 @@ config ADK_KERNEL_NET_CLS_U32_PERF
 	  fine tuning u32 classifiers.
 
 config ADK_KERNEL_NET_CLS_U32_MARK
-	prompt "Netfilter marks support"
-	bool
+	bool "Netfilter marks support"
 	select ADK_KERNEL_NET_CLS
 	depends on ADK_KERNEL_NET_CLS_U32
 	depends on ADK_KERNEL_NET_CLS_FW
@@ -256,14 +233,13 @@ config ADK_KERNEL_NET_CLS_U32_MARK
 comment "Actions"
 
 config ADK_KERNEL_NET_CLS_ACT
-	boolean
+	bool
 	select ADK_KERNEL_NET_SCHED
 	select ADK_KERNEL_NET_ESTIMATOR
 	default n
 
 config ADK_KERNEL_NET_ACT_POLICE
-	prompt "Traffic Policing"
-	tristate
+	tristate "Traffic Policing"
 	select ADK_KERNEL_NET_CLS_ACT
 	default n
 	help
@@ -272,8 +248,7 @@ config ADK_KERNEL_NET_ACT_POLICE
 	  module.
 
 config ADK_KERNEL_NET_ACT_GACT
-	prompt "Generic actions"
-	tristate
+	tristate "Generic actions"
 	select ADK_KERNEL_NET_CLS_ACT
 	default n
 	help
@@ -281,8 +256,7 @@ config ADK_KERNEL_NET_ACT_GACT
 	  accepting packets.
 
 config ADK_KERNEL_NET_ACT_MIRRED
-	prompt "Redirecting and Mirroring"
-	tristate
+	tristate "Redirecting and Mirroring"
 	select ADK_KERNEL_NET_CLS_ACT
 	default n
 	help
@@ -290,8 +264,7 @@ config ADK_KERNEL_NET_ACT_MIRRED
 	  other devices.
 
 config ADK_KERNEL_NET_ACT_IPT
-	prompt "IPtables targets"
-	tristate
+	tristate "IPtables targets"
 	select ADK_KERNEL_NET_CLS_ACT
 	select ADK_KERNEL_IP_NF_IPTABLES
 	default n
@@ -300,8 +273,7 @@ config ADK_KERNEL_NET_ACT_IPT
 	  classification.
 
 config ADK_KERNEL_NET_ACT_PEDIT
-	prompt "Packet Editing"
-	tristate
+	tristate "Packet Editing"
 	select ADK_KERNEL_NET_CLS_ACT
 	default n
 	help
diff --git a/target/linux/config/Config.in.thermal b/target/linux/config/Config.in.thermal
index 820ef8417..3585e12fe 100644
--- a/target/linux/config/Config.in.thermal
+++ b/target/linux/config/Config.in.thermal
@@ -1,6 +1,8 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+menu "Thermal driver support"
+
 config ADK_KERNEL_THERMAL
 	bool
 
@@ -10,15 +12,14 @@ config ADK_KERNEL_CPU_THERMAL
 config ADK_KERNEL_THERMAL_OF
 	bool
 
-menu "Thermal driver support"
-
 config ADK_KERNEL_IMX_THERMAL
 	bool "Temperature sensor driver for Freescale i.MX SoCs"
 	select ADK_KERNEL_THERMAL
 	select ADK_KERNEL_CPU_THERMAL
 	select ADK_KERNEL_MFD_SYSCON
-	select ADK_KERNEL_THERMAL_OF
 	select ADK_KERNEL_OF
+	select ADK_KERNEL_THERMAL_OF
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 70fafbc60..07f8e8957 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -1,6 +1,8 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+menu "Watchdog driver support"
+
 config ADK_KERNEL_WATCHDOG
 	bool
 
@@ -13,8 +15,6 @@ config ADK_KERNEL_CS5535_MFGPT
 config ADK_KERNEL_CS5535_CLOCK_EVENT_SRC
 	bool
 
-menu "Watchdog driver support"
-
 config ADK_KERNEL_BCM2708_WDT
 	bool "Hardware Watchdog for BCM2835 boards"
 	select ADK_KERNEL_WATCHDOG
diff --git a/target/linux/config/Config.in.xtensa b/target/linux/config/Config.in.xtensa
index 7394d627b..246c6a66c 100644
--- a/target/linux/config/Config.in.xtensa
+++ b/target/linux/config/Config.in.xtensa
@@ -2,10 +2,10 @@
 # material, please see the LICENCE file in the top-level directory.
 
 config ADK_KERNEL_XTENSA_VARIANT_DC233C
-	boolean
+	bool
 
 config ADK_KERNEL_XTENSA_VARIANT_DC232B
-	boolean
+	bool
 
 config ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
-	boolean
+	bool