2
0
Эх сурвалжийг харах

Add audio feature flag.

There are targets which neither have usb host nor pci support but do have audio
capabilities. Those targets should expliclitly specifiy that they support audio
through the new feature flag. The audio feature flag is also implicitly selected
by the usb and pci feature flags.

SVN-Revision: 19643
Lars-Peter Clausen 15 жил өмнө
parent
commit
900de42186

+ 1 - 1
package/kernel/modules/sound.mk

@@ -10,7 +10,7 @@ SOUND_MENU:=Sound Support
 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support
-  DEPENDS:=@PCI_SUPPORT||USB_SUPPORT||TARGET_uml
+  DEPENDS:=@AUDIO_SUPPORT
   KCONFIG:= \
 	CONFIG_SOUND \
 	CONFIG_SND \

+ 1 - 0
scripts/metadata.pl

@@ -152,6 +152,7 @@ sub target_config_features(@) {
 
 	while ($_ = shift @_) {
 		/broken/ and $ret .= "\tdepends BROKEN\n";
+		/audio/ and $ret .= "\tselect AUDIO_SUPPORT\n";
 		/display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
 		/gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
 		/pci/ and $ret .= "\tselect PCI_SUPPORT\n";

+ 5 - 0
target/Config.in

@@ -11,6 +11,9 @@ config LINUX_2_6
 config HAS_FPU
 	bool
 
+config AUDIO_SUPPORT
+	bool
+
 config DISPLAY_SUPPORT
 	bool
 
@@ -18,6 +21,7 @@ config GPIO_SUPPORT
 	bool
 
 config PCI_SUPPORT
+	select AUDIO_SUPPORT
 	bool
 
 config PCIE_SUPPORT
@@ -27,6 +31,7 @@ config PCMCIA_SUPPORT
 	bool
 
 config USB_SUPPORT
+	select AUDIO_SUPPORT
 	bool
 
 config BIG_ENDIAN

+ 1 - 1
target/linux/uml/Makefile

@@ -20,7 +20,7 @@ ARCH:=$(shell uname -m | sed \
 )
 BOARD:=uml
 BOARDNAME:=User Mode Linux
-FEATURES:=ext2
+FEATURES:=ext2 audio
 LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
 
 LINUX_VERSION:=2.6.30.10

+ 2 - 2
target/linux/xburst/Makefile

@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 ARCH:=mipsel
 BOARD:=xburst
 BOARDNAME:=XBurst JZ47x0
-FEATURES:=jffs2 tgz ubifs
+FEATURES:=jffs2 tgz ubifs audio
 
-LINUX_VERSION:=2.6.32.8
+LINUX_VERSION:=2.6.32.7
 
 DEVICE_TYPE=other