diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-28 17:17:51 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-28 17:17:51 +0200 |
| commit | a99e489421283b5191fe4ccbc37b441a777097f2 (patch) | |
| tree | 030d89b26e6c0ce267ae74c0a6f3933f345fe812 | |
| parent | 53c878565d938b310dcf5b47ef9ed1d6922e0620 (diff) | |
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 Routines" +menu "Kernel Library Routines" config ADK_KERNEL_CRC16 bool @@ -9,7 +9,7 @@ config ADK_KERNEL_CRC32 default y config ADK_KPACKAGE_KMOD_CRC_ITU_T - prompt "kmod-crc-itu-t...................... CRC ITU-T V.41 functions" + prompt "CRC ITU-T V.41 functions" tristate default n help @@ -19,14 +19,14 @@ config ADK_KPACKAGE_KMOD_CRC_ITU_T functions require M here. config ADK_KPACKAGE_KMOD_CRC16 - prompt "kmod-crc16.......................... provide CRC16 library functions" + prompt "CRC16 library functions" tristate depends on ! ADK_KERNEL_CRC16 default n help config ADK_KPACKAGE_KMOD_LIBCRC32C - prompt "kmod-libcrc32c...................... CRC32c Cyclic Redundancy-Check" + prompt "CRC32c Cyclic Redundancy-Check" tristate default n help @@ -36,11 +36,11 @@ config ADK_KPACKAGE_KMOD_LIBCRC32C require M here. See Castagnoli93. config ADK_KPACKAGE_KMOD_CRC_CCITT - prompt "kmod-crc-ccitt...................... provide CRC-CCITT library functions" + prompt "CRC-CCITT library functions" tristate default n help - This module provides CRC-CCITT library functions for kernel modules built - outside the kernel. + This module provides CRC-CCITT library functions for kernel + modules built outside the kernel. endmenu diff --git a/target/linux/config/Config.in.mips b/target/linux/config/Config.in.mips index 6f082c574..b991f5311 100644 --- a/target/linux/config/Config.in.mips +++ b/target/linux/config/Config.in.mips @@ -2,11 +2,11 @@ menu "MIPS devices support" depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_KERNEL_LEMOTE_YEELOONG2F_PDEV - prompt ".................................. Lemote Yeelong platform drivers (f.e. battery support)" + prompt "Yeelong platform drivers (f.e. battery support)" boolean + depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n - depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG help Lemote Yeelong platform drivers. diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 379c121dc..88b1e9692 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -24,14 +24,24 @@ config ADK_KERNEL_KEYS menu "Miscellaneous devices support" +source "target/linux/config/Config.in.rtc" +source "target/linux/config/Config.in.leds" +source "target/linux/config/Config.in.watchdog" +source "target/linux/config/Config.in.i2c" +source "target/linux/config/Config.in.spi" +source "target/linux/config/Config.in.regulator" +source "target/linux/config/Config.in.gpio" +source "target/linux/config/Config.in.dma" +source "target/linux/config/Config.in.lib" + config ADK_KERNEL_KEXEC - prompt ".................................. Add KEXEC syscall" + prompt "Add KEXEC syscall" boolean help You need also kexec-tools to benefit from it. config ADK_KPACKAGE_KMOD_PARPORT - prompt "kmod-parport...................... generic parallel port support" + prompt "Generic parallel port support" tristate default n depends on ADK_TARGET_WITH_PP @@ -39,7 +49,7 @@ config ADK_KPACKAGE_KMOD_PARPORT Kernel module for generic parallel port support. config ADK_KPACKAGE_KMOD_PARPORT_PC - prompt "kmod-parport-pc................. PC style parallel port support" + prompt "PC style parallel port support" tristate default n depends on ADK_KPACKAGE_KMOD_PARPORT @@ -47,7 +57,7 @@ config ADK_KPACKAGE_KMOD_PARPORT_PC Kernel module for PC style parallel port support. config ADK_KPACKAGE_KMOD_PLIP - prompt "kmod-plip....................... PLIP (internet over parallel port)" + prompt "PLIP (internet over parallel port)" tristate default n depends on ADK_KPACKAGE_KMOD_PARPORT @@ -60,7 +70,7 @@ config ADK_KPACKAGE_KMOD_PLIP This will enlarge your kernel by about 8 KiB. config ADK_KPACKAGE_KMOD_PRINTER - prompt "kmod-lp......................... line printer support" + prompt "Line printer support" tristate default n depends on ADK_KPACKAGE_KMOD_PARPORT @@ -69,7 +79,7 @@ config ADK_KPACKAGE_KMOD_PRINTER Kernel module for line printer support config ADK_KPACKAGE_KMOD_PPDEV - prompt "kmod-ppdev...................... userland parallel port driver" + prompt "Userland parallel port driver" tristate default n depends on ADK_KPACKAGE_KMOD_PARPORT @@ -78,7 +88,7 @@ config ADK_KPACKAGE_KMOD_PPDEV Kernel module for userland parallel port access config ADK_KPACKAGE_KMOD_FW_LOADER - prompt "kmod-fw-loader.................... userspace firmware loading support" + prompt "Userspace firmware loading support" tristate depends on !ADK_TARGET_SYSTEM_SHARP_ZAURUS default n @@ -87,7 +97,7 @@ config ADK_KPACKAGE_KMOD_FW_LOADER loading of external firmware files. config ADK_KPACKAGE_KMOD_EEPROM_93CX6 - prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support" + prompt "93cx6 eeprom support" tristate depends on ADK_KPACKAGE_KMOD_MAC80211 select ADK_KERNEL_MISC_DEVICES diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index f35f2ce80..dc2dd8ef7 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -41,17 +41,17 @@ config ADK_KERNEL_LLC default n config ADK_KERNEL_IP_MULTICAST - prompt ".................................. Enable IP Multicasting" + prompt "Enable IP Multicasting" boolean default n config ADK_KERNEL_IP_MROUTE - prompt ".................................. Enable IP Multicasting Routing" + prompt "Enable IP Multicasting Routing" boolean default n config ADK_KPACKAGE_KMOD_ATM - prompt "kmod-atm.......................... Asynchronous Transfer Mode (ATM)" + prompt "Asynchronous Transfer Mode (ATM)" tristate default n help @@ -69,14 +69,14 @@ config ADK_KPACKAGE_KMOD_ATM further details. config ADK_KPACKAGE_KMOD_ATM_BR2684 - prompt "kmod-atm-br2684................... BR2684 ATM module" + prompt "BR2684 ATM module" tristate select ADK_KPACKAGE_KMOD_ATM default n help config ADK_KPACKAGE_KMOD_BRIDGE - prompt "kmod-bridge....................... 802.1d Ethernet Bridging" + prompt "802.1d Ethernet Bridging" tristate select ADK_KERNEL_LLC default n @@ -102,7 +102,7 @@ config ADK_KPACKAGE_KMOD_BRIDGE bridged ARP traffic in the arptables FORWARD chain. config ADK_KPACKAGE_KMOD_VLAN_8021Q - prompt "kmod-vlan......................... 802.1q VLAN support" + prompt "802.1q VLAN support" tristate default n help @@ -120,7 +120,7 @@ config ADK_KPACKAGE_KMOD_INET_TUNNEL help config ADK_KPACKAGE_KMOD_NET_IPIP - prompt "kmod-net-ipip..................... IP in IP encapsulation support" + prompt "IP in IP encapsulation support" tristate select ADK_KPACKAGE_KMOD_INET_TUNNEL default n @@ -135,7 +135,7 @@ config ADK_KPACKAGE_KMOD_NET_IPIP networks without changing their IP addresses). config ADK_KPACKAGE_KMOD_NET_IPGRE - prompt "kmod-net-ipgre.................... GRE tunnels over IP" + prompt "GRE tunnels over IP" tristate select ADK_KERNEL_NET_IPGRE_BROADCAST select ADK_KERNEL_NET_IPGRE_DEMUX @@ -152,7 +152,7 @@ config ADK_KPACKAGE_KMOD_NET_IPGRE through the tunnel. config ADK_KPACKAGE_KMOD_IPV6 - prompt "kmod-ipv6......................... IPv6 support" + prompt "IPv6 support" tristate default m if !ADK_LINUX_M68K help @@ -166,7 +166,7 @@ config ADK_KPACKAGE_KMOD_IPV6 <http://www.bieringer.de/linux/IPv6/>. config ADK_KPACKAGE_KMOD_IPV6_SIT - prompt "kmod-ipv6-sit..................... IPv6-in-IPv4 tunnel (SIT driver)" + prompt "IPv6-in-IPv4 tunnel (SIT driver)" tristate select ADK_KPACKAGE_KMOD_INET_TUNNEL default n @@ -178,7 +178,7 @@ config ADK_KPACKAGE_KMOD_IPV6_SIT networks over an IPv4-only path. config ADK_KPACKAGE_KMOD_PPP - prompt "kmod-ppp.......................... PPP support" + prompt "PPP support" tristate select ADK_KERNEL_PPP_ASYNC select ADK_KERNEL_SLHC @@ -207,7 +207,7 @@ config ADK_KPACKAGE_KMOD_PPP synchronous PPP", below. config ADK_KPACKAGE_KMOD_PPP_MPPE - prompt "kmod-ppp-mppe................... PPP MPPE/MPPC module" + prompt "PPP MPPE/MPPC module" tristate depends on ADK_KPACKAGE_KMOD_PPP select ADK_KERNEL_CRYPTO @@ -223,7 +223,7 @@ config ADK_KPACKAGE_KMOD_PPP_MPPE configuring PPTP clients and servers to utilize this method. config ADK_KPACKAGE_KMOD_PPPOATM - prompt "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support" + prompt "PPPoA (PPP over ATM) kernel support" tristate depends on ADK_KPACKAGE_KMOD_PPP select ADK_KPACKAGE_KMOD_ATM @@ -232,7 +232,7 @@ config ADK_KPACKAGE_KMOD_PPPOATM Support for PPP over ATM config ADK_KPACKAGE_KMOD_PPPOE - prompt "kmod-pppoe...................... PPPoE (PPP over Ethernet) kernel support" + prompt "PPPoE (PPP over Ethernet) kernel support" tristate depends on ADK_KPACKAGE_KMOD_PPP default n @@ -240,14 +240,14 @@ config ADK_KPACKAGE_KMOD_PPPOE Support for PPP over Ethernet config ADK_KPACKAGE_KMOD_TUN - prompt "kmod-tun.......................... Universal TUN/TAP driver" + prompt "Universal TUN/TAP driver" tristate default n help Kernel support for the TUN/TAP tunneling device config ADK_KPACKAGE_KMOD_BONDING - prompt "kmod-bonding...................... Bonding driver support" + prompt "Bonding driver support" tristate select BUSYBOX_IFENSLAVE default n @@ -267,4 +267,3 @@ source target/linux/config/Config.in.ipsec source target/linux/config/Config.in.ipvs endmenu - diff --git a/target/linux/config/Config.in.pcmcia b/target/linux/config/Config.in.pcmcia index ab3e1f5a4..04e050631 100644 --- a/target/linux/config/Config.in.pcmcia +++ b/target/linux/config/Config.in.pcmcia @@ -32,13 +32,13 @@ config ADK_KERNEL_SERIAL_8250_SHARE_IRQ select ADK_KERNEL_SERIAL_8250_EXTENDED config ADK_KPACKAGE_KMOD_PCCARD - prompt "kmod-pccard....................... PCCARD support" + prompt "PCCARD support" tristate depends on !ADK_KERNEL_PCCARD default n config ADK_KPACKAGE_KMOD_PCMCIA - prompt "kmod-pcmcia....................... 16-bit PCMCIA support" + prompt "16-bit PCMCIA support" tristate depends on ADK_KPACKAGE_KMOD_PCCARD depends on !ADK_KERNEL_PCMCIA @@ -48,7 +48,7 @@ config ADK_KPACKAGE_KMOD_PCMCIA default n config ADK_KPACKAGE_KMOD_YENTA - prompt "kmod-cardbus...................... 32-bit CardBus support" + prompt "32-bit CardBus support" tristate depends on ADK_KPACKAGE_KMOD_PCCARD depends on ADK_TARGET_WITH_CARDBUS @@ -56,7 +56,7 @@ config ADK_KPACKAGE_KMOD_YENTA default n config ADK_KPACKAGE_KMOD_SERIAL_8250_CS - prompt "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support" + prompt "PCMCIA/CardBus serial device support" tristate default n select ADK_KERNEL_SERIAL_8250_SHARE_IRQ diff --git a/target/linux/config/Config.in.sched b/target/linux/config/Config.in.sched index 2e749a5fb..0a36b5e2b 100644 --- a/target/linux/config/Config.in.sched +++ b/target/linux/config/Config.in.sched @@ -49,7 +49,7 @@ config ADK_KERNEL_NET_SCHED comment "Queueing/Scheduling" config ADK_KPACKAGE_KMOD_NET_SCH_CBQ - prompt "kmod-sched-cbq.................... Class Based Queueing (CBQ)" + prompt "Class Based Queueing (CBQ)" tristate select ADK_KERNEL_NET_SCHED default n @@ -66,7 +66,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_CBQ want to use as leaf disciplines. config ADK_KPACKAGE_KMOD_NET_SCH_HTB - prompt "kmod-sched-htb.................... Hierarchical Token Bucket (HTB)" + prompt "Hierarchical Token Bucket (HTB)" tristate select ADK_KERNEL_NET_SCHED default n @@ -80,7 +80,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_HTB different properties and different algorithm. config ADK_KPACKAGE_KMOD_NET_SCH_HFSC - prompt "kmod-sched-hfsc................... Hierarchical Fair Service Curve (HFSC)" + prompt "Hierarchical Fair Service Curve (HFSC)" tristate select ADK_KERNEL_NET_SCHED default n @@ -89,7 +89,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_HFSC (HFSC) packet scheduling algorithm. config ADK_KPACKAGE_KMOD_NET_SCH_ATM - prompt "kmod-sched-atm.................... ATM Virtual Circuits (ATM)" + prompt "ATM Virtual Circuits (ATM)" tristate depends on ADK_KPACKAGE_KMOD_ATM select ADK_KERNEL_NET_SCHED @@ -103,7 +103,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_ATM See the top of <file:net/sched/sch_atm.c>) for more details. config ADK_KPACKAGE_KMOD_NET_SCH_PRIO - prompt "kmod-sched-prio................... Multi Band Priority Queueing (PRIO)" + prompt "Multi Band Priority Queueing (PRIO)" tristate select ADK_KERNEL_NET_SCHED default n @@ -112,7 +112,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_PRIO scheduler. config ADK_KPACKAGE_KMOD_NET_SCH_RED - prompt "kmod-sched-red.................... Random Early Detection (RED)" + prompt "Random Early Detection (RED)" tristate select ADK_KERNEL_NET_SCHED default n @@ -123,7 +123,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_RED See the top of <file:net/sched/sch_red.c> for more details. config ADK_KPACKAGE_KMOD_NET_SCH_SFQ - prompt "kmod-sched-sfq.................... Stochastic Fairness Queueing (SFQ)" + prompt "Stochastic Fairness Queueing (SFQ)" tristate select ADK_KERNEL_NET_SCHED default n @@ -133,20 +133,8 @@ config ADK_KPACKAGE_KMOD_NET_SCH_SFQ See the top of <file:net/sched/sch_sfq.c> for more details. -#config ADK_KPACKAGE_KMOD_NET_SCH_TEQL -# prompt "kmod-sched-teql................... True Link Equalizer (TEQL)" -# tristate -# select ADK_KERNEL_NET_SCHED -# default n -# help -# Say Y here if you want to use the True Link Equalizer (TLE) packet -# scheduling algorithm. This queueing discipline allows the combination -# of several physical devices into one virtual device. -# -# See the top of <file:net/sched/sch_teql.c> for more details. - config ADK_KPACKAGE_KMOD_NET_SCH_TBF - prompt "kmod-sched-tbf.................... Token Bucket Filter (TBF)" + prompt "Token Bucket Filter (TBF)" tristate select ADK_KERNEL_NET_SCHED default n @@ -157,7 +145,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_TBF See the top of <file:net/sched/sch_tbf.c> for more details. config ADK_KPACKAGE_KMOD_NET_SCH_GRED - prompt "kmod-sched-gred................... Generic Random Early Detection (GRED)" + prompt "Generic Random Early Detection (GRED)" tristate select ADK_KERNEL_NET_SCHED default n @@ -168,7 +156,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_GRED references about the algorithm). config ADK_KPACKAGE_KMOD_NET_SCH_DSMARK - prompt "kmod-sched-dsmark................. Differentiated Services marker (DSMARK)" + prompt "Differentiated Services marker (DSMARK)" tristate select ADK_KERNEL_NET_SCHED default n @@ -179,7 +167,7 @@ config ADK_KPACKAGE_KMOD_NET_SCH_DSMARK RFCs, is available at <http://www.gta.ufrj.br/diffserv/>. config ADK_KPACKAGE_KMOD_NET_SCH_INGRESS - prompt "kmod-sched-ingress................ Ingress Qdisc" + prompt "Ingress Qdisc" tristate select ADK_KERNEL_NET_SCHED select ADK_KERNEL_NETFILTER @@ -197,7 +185,7 @@ config ADK_KERNEL_NET_CLS default n config ADK_KPACKAGE_KMOD_NET_CLS_BASIC - prompt "kmod-cls-basic.................... Elementary classification (BASIC)" + prompt "Elementary classification (BASIC)" tristate select ADK_KERNEL_NET_CLS default n @@ -206,7 +194,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_BASIC only extended matches and actions. config ADK_KPACKAGE_KMOD_NET_CLS_TCINDEX - prompt "kmod-cls-tcindex.................. Traffic-Control Index (TCINDEX)" + prompt "Traffic-Control Index (TCINDEX)" tristate select ADK_KERNEL_NET_CLS default n @@ -216,7 +204,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_TCINDEX to implement Differentiated Services together with DSMARK. config ADK_KPACKAGE_KMOD_NET_CLS_ROUTE4 - prompt "kmod-cls-route4................... Routing decision (ROUTE)" + prompt "Routing decision (ROUTE)" tristate select ADK_KERNEL_NET_CLS default n @@ -225,7 +213,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_ROUTE4 according to the route table entry they matched. config ADK_KPACKAGE_KMOD_NET_CLS_FW - prompt "kmod-cls-fw....................... Netfilter mark (FW)" + prompt "Netfilter mark (FW)" tristate select ADK_KERNEL_NET_CLS default n @@ -234,7 +222,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_FW according to netfilter/firewall marks. config ADK_KPACKAGE_KMOD_NET_CLS_U32 - prompt "kmod-cls-u32...................... Universal 32bit comparisons w/ hashing (U32)" + prompt "Universal 32bit comparisons w/ hashing (U32)" tristate select ADK_KERNEL_NET_CLS default n @@ -243,7 +231,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_U32 32bit pieces based comparison scheme. config ADK_KPACKAGE_KMOD_NET_CLS_U32_PERF - prompt ".................................. Performance counters support" + prompt "Performance counters support" bool select ADK_KERNEL_NET_CLS depends on ADK_KPACKAGE_KMOD_NET_CLS_U32 @@ -253,7 +241,7 @@ config ADK_KPACKAGE_KMOD_NET_CLS_U32_PERF fine tuning u32 classifiers. config ADK_KPACKAGE_KMOD_NET_CLS_U32_MARK - prompt ".................................. Netfilter marks support" + prompt "Netfilter marks support" bool select ADK_KERNEL_NET_CLS depends on ADK_KPACKAGE_KMOD_NET_CLS_U32 @@ -271,7 +259,7 @@ config ADK_KERNEL_NET_CLS_ACT default n config ADK_KPACKAGE_KMOD_NET_ACT_POLICE - prompt "kmod-act-police................... Traffic Policing" + prompt "Traffic Policing" tristate select ADK_KERNEL_NET_CLS_ACT default n @@ -281,7 +269,7 @@ config ADK_KPACKAGE_KMOD_NET_ACT_POLICE module. config ADK_KPACKAGE_KMOD_NET_ACT_GACT - prompt "kmod-act-gact..................... Generic actions" + prompt "Generic actions" tristate select ADK_KERNEL_NET_CLS_ACT default n @@ -290,7 +278,7 @@ config ADK_KPACKAGE_KMOD_NET_ACT_GACT accepting packets. config ADK_KPACKAGE_KMOD_NET_ACT_MIRRED - prompt "kmod-act-mirred................... Redirecting and Mirroring" + prompt "Redirecting and Mirroring" tristate select ADK_KERNEL_NET_CLS_ACT default n @@ -299,7 +287,7 @@ config ADK_KPACKAGE_KMOD_NET_ACT_MIRRED other devices. config ADK_KPACKAGE_KMOD_NET_ACT_IPT - prompt "kmod-act-ipt...................... IPtables targets" + prompt "IPtables targets" tristate select ADK_KERNEL_NET_CLS_ACT select ADK_KPACKAGE_KMOD_IP_NF_IPTABLES @@ -309,7 +297,7 @@ config ADK_KPACKAGE_KMOD_NET_ACT_IPT classification. config ADK_KPACKAGE_KMOD_NET_ACT_PEDIT - prompt "kmod-act-pedit.................... Packet Editing" + prompt "Packet Editing" tristate select ADK_KERNEL_NET_CLS_ACT default n diff --git a/target/linux/config/Config.in.sensors b/target/linux/config/Config.in.sensors index 941913bbd..9a9b44f5f 100644 --- a/target/linux/config/Config.in.sensors +++ b/target/linux/config/Config.in.sensors @@ -4,22 +4,21 @@ config ADK_KERNEL_HWMON boolean config ADK_KPACKAGE_KMOD_CORETEMP - prompt "kmod-coretemp..................... Coretemp" + prompt "Coretemp" boolean + select ADK_KERNEL_EXPERIMENTAL select ADK_KERNEL_I2C select ADK_KERNEL_I2C_CHARDEV select ADK_KERNEL_HWMON - select ADK_KERNEL_EXPERIMENTAL default n help Coretemp module config ADK_KPACKAGE_KMOD_IT87 - prompt "kmod-it87......................... it87" + prompt "IT87" boolean default n help Module for IT87 smbus chipsets - endmenu diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 8053b620a..582faff3b 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -55,7 +55,7 @@ config ADK_KERNEL_USB_OHCI_HCD select ADK_PACKAGE_KMOD_USB_CONTROLLER config ADK_KPACKAGE_KMOD_USB - prompt "kmod-usb......................... USB support" + prompt "USB support" tristate select ADK_KERNEL_NLS select ADK_KERNEL_USB_SUPPORT @@ -97,8 +97,48 @@ config ADK_KPACKAGE_KMOD_USB in <file:Documentation/usb/> and especially the links given in <file:Documentation/usb/usb-help.txt>. +menu "USB controller support" + +config ADK_KPACKAGE_KMOD_USB_EHCI_HCD + prompt "Support for USB EHCI 2.0 controllers" + tristate + select ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KERNEL_USB_EHCI_ROOT_HUB_TT + select ADK_KERNEL_USB_EHCI_TT_NEWSCHED + select ADK_KERNEL_USB_MXS_PHY + depends on !ADK_KERNEL_USB_EHCI_HCD + depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI + depends on ADK_KPACKAGE_KMOD_USB + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_TARGET_SYSTEM_CUBOX_I + default n + help + The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 + "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware. + If your USB host controller supports USB 2.0, you will likely want to + configure this Host Controller Driver. At the time of this writing, + the primary implementation of EHCI is a chip from NEC, widely available + in add-on PCI cards, but implementations are in the works from other + vendors including Intel and Philips. Motherboard support is appearing. + + EHCI controllers are packaged with "companion" host controllers (OHCI + or UHCI) to handle USB 1.1 devices connected to root hub ports. Ports + will connect to EHCI if the device is high speed, otherwise they + connect to a companion controller. If you configure EHCI, you should + probably configure the OHCI (for NEC and some other vendors) USB Host + Controller Driver or UHCI (for Via motherboards) Host Controller + Driver too. + + You may want to read <file:Documentation/usb/ehci.txt>. + + config ADK_KPACKAGE_KMOD_USB_UHCI_HCD - prompt "kmod-usb-uhci................... Support for UHCI controllers" + prompt "Support for UHCI controllers" tristate select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB @@ -119,7 +159,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD 133). If unsure, say Y. config ADK_KPACKAGE_KMOD_USB_OHCI_HCD - prompt "kmod-usb-ohci................... Support for OHCI controllers" + prompt "Support for OHCI controllers" tristate select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB @@ -140,8 +180,33 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD based system where you're not sure, the "lspci -v" entry will list the right "prog-if" for your USB controller(s): EHCI, OHCI, or UHCI. +config ADK_KERNEL_USB_DWCOTG + prompt "Support for DWCOTG controller" + boolean + select ADK_KERNEL_USB + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y + help + The Synopsis DWC controller is a dual-role + host/peripheral/OTG ("On The Go") USB controllers. + +config ADK_KERNEL_USB_CHIPIDEA_UDC + boolean + +config ADK_KERNEL_USB_CHIPIDEA_HOST + boolean + +config ADK_KPACKAGE_KMOD_USB_CHIPIDEA + prompt "Support for ChipIdea controller" + tristate + select ADK_KERNEL_USB_CHIPIDEA_UDC + select ADK_KERNEL_USB_CHIPIDEA_HOST + depends on ADK_KPACKAGE_KMOD_USB_EHCI_HCD + default y if ADK_TARGET_SYSTEM_CUBOX_I + default n + config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD - prompt "kmod-usb-isp116x................ ISP116X HCD support" + prompt "Support for ISP116X" tristate select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB @@ -155,7 +220,7 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD This driver does not support isochronous transfers. config ADK_KPACKAGE_KMOD_USB_SL811_HCD - prompt "kmod-usb-sl811.................. SL811HS HCD support" + prompt "Support for SL811HS" tristate select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB @@ -168,101 +233,62 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD board has this chip, and you want to use it as a host controller. If unsure, say N. -config ADK_KERNEL_USB_DWCOTG - boolean - select ADK_KERNEL_USB - depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y - help - The Synopsis DWC controller is a dual-role - host/peripheral/OTG ("On The Go") USB controllers. - -config ADK_KPACKAGE_KMOD_USB_EHCI_HCD - prompt "kmod-usb-ehci..................... Support for USB 2.0 controllers" +config ADK_PACKAGE_KMOD_USB_CONTROLLER tristate - select ADK_PACKAGE_KMOD_USB_CONTROLLER - select ADK_KERNEL_USB_EHCI_ROOT_HUB_TT - select ADK_KERNEL_USB_EHCI_TT_NEWSCHED - select ADK_KERNEL_USB_MXS_PHY - depends on !ADK_KERNEL_USB_EHCI_HCD - depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 - depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI - depends on ADK_KPACKAGE_KMOD_USB - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_CUBOX_I + default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n - help - The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 - "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware. - If your USB host controller supports USB 2.0, you will likely want to - configure this Host Controller Driver. At the time of this writing, - the primary implementation of EHCI is a chip from NEC, widely available - in add-on PCI cards, but implementations are in the works from other - vendors including Intel and Philips. Motherboard support is appearing. - - EHCI controllers are packaged with "companion" host controllers (OHCI - or UHCI) to handle USB 1.1 devices connected to root hub ports. Ports - will connect to EHCI if the device is high speed, otherwise they - connect to a companion controller. If you configure EHCI, you should - probably configure the OHCI (for NEC and some other vendors) USB Host - Controller Driver or UHCI (for Via motherboards) Host Controller - Driver too. - You may want to read <file:Documentation/usb/ehci.txt>. - -config ADK_KERNEL_USB_CHIPIDEA_UDC - boolean +endmenu -config ADK_KERNEL_USB_CHIPIDEA_HOST - boolean +menu "USB devices support" -config ADK_KPACKAGE_KMOD_USB_CHIPIDEA - prompt "kmod-ci-hdrc...................... Support ChipIdea controller" +config ADK_KPACKAGE_KMOD_USB_STORAGE + prompt "Support for USB storage devices" tristate - select ADK_KERNEL_USB_CHIPIDEA_UDC - select ADK_KERNEL_USB_CHIPIDEA_HOST - depends on ADK_KPACKAGE_KMOD_USB_EHCI_HCD - default y if ADK_TARGET_SYSTEM_CUBOX_I + depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + depends on !ADK_KERNEL_USB_STORAGE + select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI + select ADK_KPACKAGE_KMOD_BLK_DEV_SD if !ADK_KERNEL_SCSI default n -config ADK_PACKAGE_KMOD_USB_CONTROLLER +config ADK_KPACKAGE_KMOD_SND_USB_AUDIO + prompt "Support for USB sound adapter" tristate - default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + select ADK_KERNEL_SND_USB + select ADK_KPACKAGE_KMOD_SND + select ADK_KPACKAGE_KMOD_SND_RAWMIDI + depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_USB_ACM - prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers" +config ADK_KPACKAGE_KMOD_USB_HSO + prompt "Support for USB HSO devices" tristate + select ADK_KPACKAGE_KMOD_RFKILL + select ADK_KPACKAGE_KMOD_USB_STORAGE depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_USB_PEGASUS - prompt "kmod-usb-pegasus.................. Support for USB Pegasus" +config ADK_KPACKAGE_KMOD_USB_PRINTER + prompt "Support for USB printers" tristate depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_USB_HSO - prompt "kmod-usb-hso...................... Support for USB HSO devices" +config ADK_KPACKAGE_KMOD_USB_ACM + prompt "Support for USB modems/isdn controllers" tristate - select ADK_KPACKAGE_KMOD_RFKILL - select ADK_KPACKAGE_KMOD_USB_STORAGE depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_USB_PRINTER - prompt "kmod-usb-printer.................. Support for USB printers" +config ADK_KPACKAGE_KMOD_USB_PEGASUS + prompt "Support for USB Pegasus network cards" tristate depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n config ADK_KPACKAGE_KMOD_USB_SERIAL - prompt "kmod-usb-serial................... Support for USB-to-serial converters" + prompt "Support for USB-to-serial converters" tristate depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n @@ -276,7 +302,7 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL supported, and on how to use them. config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN - prompt "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters" + prompt "Support for Belkin USB-to-serial converters" tristate depends on ADK_KPACKAGE_KMOD_USB_SERIAL default n @@ -286,7 +312,7 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN port USB to serial adapter. config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO - prompt "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converter" + prompt "Support for FTDI USB-to-serial converter" tristate depends on ADK_KPACKAGE_KMOD_USB_SERIAL default n @@ -299,7 +325,7 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO information on this driver and the device. config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232 - prompt "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters" + prompt "Support for Magic Control Technology USB-to-Serial converters" tristate depends on ADK_KPACKAGE_KMOD_USB_SERIAL default n @@ -311,7 +337,7 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232 BAY, Belkin F5U109, and Belkin F5U409 devices. config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303 - prompt "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters" + prompt "Support for Prolific PL2303 USB-to-Serial converters" tristate depends on ADK_KPACKAGE_KMOD_USB_SERIAL default n @@ -320,7 +346,7 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303 adapter from Prolific. config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR - prompt "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver" + prompt "Support for Handspring Visor / Palm m50x / Sony Clie Driver" tristate depends on ADK_KPACKAGE_KMOD_USB_SERIAL default n @@ -330,46 +356,29 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR <http://usbvisor.sourceforge.net/> for more information on using this driver. -config ADK_KPACKAGE_KMOD_USB_STORAGE - prompt "kmod-usb-storage.................. Support for USB storage devices" - tristate - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER - depends on !ADK_KERNEL_USB_STORAGE - select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI - select ADK_KPACKAGE_KMOD_BLK_DEV_SD if !ADK_KERNEL_SCSI - default n - config ADK_KPACKAGE_KMOD_USB_ATM - prompt "kmod-usb-atm...................... Support for USB ATM devices" + prompt "Support for USB ATM devices" tristate depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n config ADK_KPACKAGE_KMOD_USB_ATM_SPEEDTOUCH - prompt "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem" + prompt "Support for USB Speedtouch ADSL modem" tristate depends on ADK_KPACKAGE_KMOD_USB_ATM default n config ADK_KPACKAGE_KMOD_USB_USBNET - prompt "kmod-usb-usbnet................... Multi-purpose USB Networking Framework" + prompt "Multi-purpose USB Networking Framework" tristate depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n -config ADK_KPACKAGE_KMOD_SND_USB_AUDIO - prompt "kmod-snd-usb-audio................ USB sound adapter" - tristate - select ADK_KERNEL_SND_USB - select ADK_KPACKAGE_KMOD_SND - select ADK_KPACKAGE_KMOD_SND_RAWMIDI - depends on ADK_PACKAGE_KMOD_USB_CONTROLLER - default n - config ADK_KPACKAGE_KMOD_USB_SISUSBVGA - prompt "kmod-usb-svga..................... USB 2.0 SVGA dongle support (Net2280/SiS315)" + prompt "USB 2.0 SVGA dongle support (Net2280/SiS315)" tristate depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n endmenu +endmenu diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio index 4ee027baa..71d67cc94 100644 --- a/target/linux/config/Config.in.virtio +++ b/target/linux/config/Config.in.virtio @@ -14,22 +14,22 @@ menu "Virtio driver support" depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU config ADK_KPACKAGE_KMOD_VIRTIO_NET - prompt "kmod-virtio-net.................... Virtio net driver" + prompt "Virtio net driver" tristate + depends on !ADK_KERNEL_VIRTIO_NET select ADK_KERNEL_VIRTIO select ADK_KERNEL_VIRTIO_PCI - depends on !ADK_KERNEL_VIRTIO_NET default n help Enables support for Virtio Net driver. config ADK_KPACKAGE_KMOD_VIRTIO_BLK - prompt "kmod-virtio-block.................. Virtio block driver" + prompt "Virtio block driver" tristate + depends on !ADK_KERNEL_VIRTIO_BLK select ADK_KERNEL_VIRTIO select ADK_KERNEL_VIRTIO_PCI select ADK_KERNEL_BLK_DEV - depends on !ADK_KERNEL_VIRTIO_BLK default n help Enables support for Virtio Block driver. diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 4a727e7d6..1ce7e5ac8 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -13,42 +13,43 @@ config ADK_KERNEL_CS5535_MFGPT config ADK_KERNEL_CS5535_CLOCK_EVENT_SRC boolean -menu "Watchdog support" +menu "Watchdog driver support" config ADK_KERNEL_SCx200_WDT - prompt ".................................. Natsemi Hardware Watchdog" + prompt "Natsemi Hardware Watchdog" boolean + depends on ADK_TARGET_SYSTEM_PCENGINES_WRAP select ADK_KERNEL_WATCHDOG select ADK_KERNEL_SCx200 default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP default n - depends on ADK_TARGET_SYSTEM_PCENGINES_WRAP help Natsemi Watchdog (scx200) config ADK_KERNEL_AT91SAM9X_WATCHDOG - prompt ".................................. AT91SAM9X Hardware Watchdog" + prompt "AT91SAM9X Hardware Watchdog" boolean + depends on ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_KERNEL_WATCHDOG default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default n - depends on ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 help AT91SAM9X Watchdog. config ADK_KERNEL_AR7_WDT - prompt ".................................. AR7 Hardware Watchdog" + prompt "AR7 Hardware Watchdog" boolean + depends on ADK_TARGET_SYSTEM_LINKSYS_AG241 select ADK_KERNEL_WATCHDOG default y if ADK_TARGET_SYSTEM_LINKSYS_AG241 default n - depends on ADK_TARGET_SYSTEM_LINKSYS_AG241 help AR7 Watchdog. config ADK_KERNEL_GEODE_WDT - prompt ".................................. Geode Hardware Watchdog" + prompt "Geode Hardware Watchdog" boolean + depends on ADK_CPU_GEODE select ADK_KERNEL_WATCHDOG select ADK_KERNEL_MISC_DEVICES select ADK_KERNEL_CS5535_MFGPT @@ -57,23 +58,22 @@ config ADK_KERNEL_GEODE_WDT default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default n - depends on ADK_CPU_GEODE help Geode watchdog. config ADK_KERNEL_RC32434_WDT - prompt ".................................. IDT RC32434 Hardware Watchdog" + prompt "IDT RC32434 Hardware Watchdog" boolean + depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532 select ADK_KERNEL_WATCHDOG default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 default n - depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532 help Support for the hardware watchdog inside Routerboard 532's SoC, the IDT RC32434. config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG - prompt "kmod-soft-watchdog...................... Software watchdog" + prompt "Software watchdog" tristate default n select ADK_KERNEL_WATCHDOG diff --git a/target/linux/config/Config.in.video b/target/linux/config/Config.in.webcam index 6182ea6cf..7759a127e 100644 --- a/target/linux/config/Config.in.video +++ b/target/linux/config/Config.in.webcam @@ -11,14 +11,14 @@ config ADK_KERNEL_MEDIA_USB_SUPPORT config ADK_KERNEL_MEDIA_CAMERA_SUPPORT boolean -menu "Video devices support" +menu "Webcam support" config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT tristate default n help config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS - prompt "kmod-usb-video-class............ Kernel driver for USB video webcams" + prompt "Kernel driver for USB video webcams" tristate depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT @@ -26,36 +26,36 @@ config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS help config ADK_KPACKAGE_KMOD_USB_GSPCA - prompt "kmod-usb-gspca................... GSPCA webcam framework" + prompt "GSPCA webcam framework" + tristate depends on ADK_TARGET_WITH_USB select ADK_KERNEL_VIDEO_V4L2 select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT select ADK_KERNEL_MEDIA_USB_SUPPORT select ADK_KERNEL_MEDIA_CAMERA_SUPPORT - tristate help GSPCA webcam framework config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207 - prompt "kmod-usb-gpsca-pac207............ Pixart PAC207 USB Camera Driver" + prompt "Pixart PAC207 USB Camera Driver" tristate depends on ADK_KPACKAGE_KMOD_USB_GSPCA help config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311 - prompt "kmod-usb-gpsca-pac7311........... Pixart PAC7311 USB Camera Driver" + prompt "Pixart PAC7311 USB Camera Driver" tristate depends on ADK_KPACKAGE_KMOD_USB_GSPCA help config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561 - prompt "kmod-usb-gpsca-spca561........... SPCA561 USB Camera Driver" + prompt "SPCA561 USB Camera Driver" tristate depends on ADK_KPACKAGE_KMOD_USB_GSPCA help config ADK_KPACKAGE_KMOD_USB_PWC - prompt "kmod-usb-pwc..................... Kernel driver for USB Philips Cameras" + prompt "USB Philips Camera driver" tristate depends on ADK_TARGET_WITH_USB default n |