diff options
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.audio | 33 | ||||
| -rw-r--r-- | target/linux/config/Config.in.debug | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netfilter.ip4 | 11 | ||||
| -rw-r--r-- | target/linux/config/Config.in.watchdog | 2 |
4 files changed, 37 insertions, 10 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 76c353f0c..c466bed45 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -7,9 +7,6 @@ config ADK_KERNEL_SND_ARM config ADK_KERNEL_SND_USB boolean -config ADK_KERNEL_SND_SOC - boolean - config ADK_KERNEL_SND_PXA2XX_AC97 boolean @@ -105,6 +102,10 @@ config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO help ALSA AMD CS5535 driver +config ADK_KPACKAGE_KMOD_SND_SOC + tristate + default n + config ADK_KERNEL_SND_PXA2XX_SOC tristate default n @@ -113,10 +114,10 @@ config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ prompt "kmod-snd-pxa2xx-soc-spitz..... ALSA SOC Sharp Zaurus" tristate select ADK_KERNEL_SND_ARM - select ADK_KERNEL_SND_SOC select ADK_KERNEL_SND_PXA2XX_AC97 - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC select ADK_KPACKAGE_KMOD_SND + select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + select ADK_KPACKAGE_KMOD_SND_SOC select ADK_KERNEL_SND_PXA2XX_SOC depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS @@ -131,4 +132,26 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n +config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S + prompt "kmod-snd-bcm2708-soc-i2s........ ALSA SOC I2S Raspberry PI" + select ADK_KPACKAGE_KMOD_SND + select ADK_KERNEL_SND_ARM + select ADK_KPACKAGE_KMOD_SND_SOC + boolean + default n + +config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC + prompt "kmod-snd-bcm2708-hifiberry-dac.... ALSA for Raspberry PI with hifiberry DAC" + tristate + select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + +config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI + prompt "kmod-snd-bcm2708-hifiberry-digi... ALSA for Raspberry PI with hifiberry DIGI" + tristate + select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + endmenu diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 46942160f..80387c627 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -34,6 +34,7 @@ config ADK_KERNEL_PRINTK boolean select ADK_KERNEL_EARLY_PRINTK default y + depends on !ADK_PKG_TEST help Disable printk to save space and quieten bootup. diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index cf33c02a2..b43a566b9 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -37,9 +37,10 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER config ADK_KPACKAGE_KMOD_FULL_NAT tristate "Meta package for Full NAT" select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82 + select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30 select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_11 - select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_5 + select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13 + select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6 config ADK_KPACKAGE_KMOD_NF_NAT tristate 'Full NAT' @@ -53,8 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT config ADK_KPACKAGE_KMOD_NF_NAT_IPV4 tristate 'Full NAT' depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES - depends on ADK_KERNEL_VERSION_3_11_10 || ADK_KERNEL_VERSION_3_12_11 \ - || ADK_KERNEL_VERSION_3_13_5 + depends on ADK_KERNEL_VERSION_3_10_30 \ + || ADK_KERNEL_VERSION_3_11_10 \ + || ADK_KERNEL_VERSION_3_12_13 \ + || ADK_KERNEL_VERSION_3_13_6 help The Full NAT option allows masquerading, port forwarding and other forms of full Network Address Port Translation. It is controlled by diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 08e884a01..4a727e7d6 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -73,7 +73,7 @@ config ADK_KERNEL_RC32434_WDT Routerboard 532's SoC, the IDT RC32434. config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG - prompt "kmod-softdog...................... Software watchdog" + prompt "kmod-soft-watchdog...................... Software watchdog" tristate default n select ADK_KERNEL_WATCHDOG |