diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch | 13 | ||||
| -rw-r--r-- | target/arm/systems/raspberry-pi | 2 | ||||
| -rw-r--r-- | target/collections/mpd | 1 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 23 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.audio | 10 | ||||
| -rw-r--r-- | target/linux/config/Config.in.i2c | 16 | ||||
| -rw-r--r-- | target/linux/config/Config.in.spi | 13 |
8 files changed, 63 insertions, 21 deletions
diff --git a/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch index a22683a31..eca3a9639 100644 --- a/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch +++ b/target/arm/raspberry-pi/patches/3.16.2/raspberry-pi.patch @@ -110217,19 +110217,6 @@ diff -Nur linux-3.16.2/sound/soc/codecs/Kconfig linux-3.16-rpi/sound/soc/codecs/ select SND_SOC_RT5631 if I2C select SND_SOC_RT5640 if I2C select SND_SOC_RT5645 if I2C -@@ -428,12 +429,6 @@ - config SND_SOC_PCM512x - tristate - --config SND_SOC_PCM512x_I2C -- tristate "Texas Instruments PCM512x CODECs - I2C" -- depends on I2C -- select SND_SOC_PCM512x -- select REGMAP_I2C -- - config SND_SOC_PCM512x_SPI - tristate "Texas Instruments PCM512x CODECs - SPI" - depends on SPI_MASTER @@ -449,6 +444,12 @@ default m if SND_SOC_RT5645=m default m if SND_SOC_RT5651=m diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi index 45fd531d3..c0f375f68 100644 --- a/target/arm/systems/raspberry-pi +++ b/target/arm/systems/raspberry-pi @@ -12,6 +12,8 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_SD + select ADK_TARGET_WITH_I2C + select ADK_TARGET_WITH_SPI select ADK_PACKAGE_BCM2835_BOOTLOADER select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/collections/mpd b/target/collections/mpd index be6ccf680..456386e8b 100644 --- a/target/collections/mpd +++ b/target/collections/mpd @@ -20,6 +20,7 @@ config ADK_PKG_MPD select ADK_PACKAGE_MPD_WITH_SHOUT select ADK_PACKAGE_MPD_WITH_CURL select ADK_PACKAGE_MPD_WITH_SAMPLERATE + select ADK_PACKAGE_MPD_WITH_SNDFILE select ADK_PACKAGE_MPD_WITH_HTTPD select ADK_PACKAGE_FILE select ADK_PACKAGE_HTOP diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 207bcc0c1..6b7ee495b 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -349,6 +349,29 @@ config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_GW endmenu +choice +prompt "WLAN Security" +depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC || ADK_SIMPLE_NETWORK_CONFIG_WLAN0_DHCP +default ADK_SIMPLE_NETWORK_CONFIG_WLAN0_NOSEC + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_NOSEC + bool "No security" + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 + bool "WPA2" + +endchoice + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_SSID + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 + string "SSID" + default "" + +config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_PW + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 + string "Password" + default "" + menu "eth1 Configuration" depends on ADK_SIMPLE_NETWORK_CONFIG && \ ADK_TARGET_SYSTEM_MIKROTIK_RB532 diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 3a5d98cf1..16c075212 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -74,7 +74,9 @@ config ADK_TOOLCHAIN_BINUTILS_2_20_1 config ADK_TOOLCHAIN_BINUTILS_2_22 prompt "2.22" boolean - depends on ADK_LINUX_BFIN || ADK_LINUX_CRIS + depends on ADK_LINUX_BFIN \ + || ADK_LINUX_CRIS \ + || ADK_LINUX_M68K config ADK_TOOLCHAIN_BINUTILS_2_23_ARC prompt "2.23-arc" @@ -88,6 +90,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_24 depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 depends on !ADK_LINUX_CRIS + depends on !ADK_LINUX_M68K config ADK_TOOLCHAIN_BINUTILS_GIT prompt "git" @@ -97,6 +100,7 @@ config ADK_TOOLCHAIN_BINUTILS_GIT depends on !ADK_LINUX_ARC depends on !ADK_LINUX_AVR32 depends on !ADK_LINUX_CRIS + depends on !ADK_LINUX_M68K endchoice diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d354ba0d3..f9bea1260 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -81,6 +81,10 @@ config ADK_KERNEL_SND_SOC_PCM5102A boolean select ADK_KERNEL_SND_SOC_I2C_AND_SPI +config ADK_KERNEL_SND_SOC_PCM512x_I2C + boolean + select ADK_KERNEL_SND_SOC_I2C_AND_SPI + config ADK_KERNEL_SND_PCM_DMAENGINE boolean @@ -165,7 +169,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_DMAENGINE_PCM select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM select ADK_KERNEL_REGMAP_MMIO - select ADK_KERNEL_SND_SOC_PCM5102A depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n @@ -174,8 +177,8 @@ config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DAC boolean select ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_SND_BCM2708_SOC_I2S + select ADK_KERNEL_SND_SOC_PCM5102A depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_PKG_MPDBOX default n config ADK_KERNEL_SND_BCM2708_SOC_HIFIBERRY_DIGI @@ -193,7 +196,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_RPI_DAC select ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_SND_BCM2708_SOC_I2S depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_PKG_MPDBOX default n config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC @@ -201,8 +203,8 @@ config ADK_KERNEL_SND_BCM2708_SOC_IQAUDIO_DAC boolean select ADK_KERNEL_DMA_BCM2708 select ADK_KERNEL_SND_BCM2708_SOC_I2S + select ADK_KERNEL_SND_SOC_PCM512x_I2C depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_PKG_MPDBOX default n config ADK_KERNEL_SND_IMX_SOC diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c index bc4da73f6..83ef3a1fa 100644 --- a/target/linux/config/Config.in.i2c +++ b/target/linux/config/Config.in.i2c @@ -7,13 +7,25 @@ config ADK_KERNEL_I2C config ADK_KERNEL_I2C_CHARDEV tristate +config ADK_KERNEL_I2C_BCM2835 + prompt "I2C driver for Raspberry PI" + tristate + select ADK_KERNEL_I2C + select ADK_KERNEL_REGMAP_I2C + select ADK_KERNEL_I2C_CHARDEV + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + help + I2C driver for Raspberry PI. + config ADK_KERNEL_I2C_IMX - prompt "I2C driver for IMX6" + prompt "I2C driver for Solidrun IMX6" tristate - depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_KERNEL_I2C select ADK_KERNEL_REGMAP_I2C select ADK_KERNEL_I2C_CHARDEV + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index 12637f9cb..9a6e6e337 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -26,12 +26,23 @@ config ADK_KERNEL_SPI_PXA2XX tristate select ADK_KERNEL_SPI +config ADK_KERNEL_SPI_BCM2835 + prompt "SPI driver for Raspberry PI" + tristate + select ADK_KERNEL_SPI + select ADK_KERNEL_SPI_MASTER + select ADK_KERNEL_SPI_BITBANG + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + config ADK_KERNEL_SPI_IMX - prompt "SPI driver for Solidrun Cubox-i/Hummingboard" + prompt "SPI driver for Solidrun IMX6" tristate select ADK_KERNEL_SPI select ADK_KERNEL_SPI_MASTER select ADK_KERNEL_SPI_BITBANG + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n |