From 7bb7d4687eef01ec9f9abea4636e331ba2d53b75 Mon Sep 17 00:00:00 2001 From: kyak Date: Sat, 14 May 2011 17:12:03 +0400 Subject: [PATCH] trunk: build sound modules in kernel --- package/kernel/modules/sound.mk | 2 +- target/linux/xburst/qi_lb60/config-2.6.37 | 19 +++++++++++++++++++ target/linux/xburst/qi_lb60/target.mk | 7 ------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index 2d0a987b6..146e0bbfe 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -50,7 +50,7 @@ SOUNDCORE_FILES ?= \ define KernelPackage/sound-core SUBMENU:=$(SOUND_MENU) TITLE:=Sound support - DEPENDS:=@AUDIO_SUPPORT + DEPENDS:=@AUDIO_SUPPORT @!TARGET_xburst_qi_lb60 KCONFIG:= \ CONFIG_SOUND \ CONFIG_SND \ diff --git a/target/linux/xburst/qi_lb60/config-2.6.37 b/target/linux/xburst/qi_lb60/config-2.6.37 index f313550ad..626d9de0e 100644 --- a/target/linux/xburst/qi_lb60/config-2.6.37 +++ b/target/linux/xburst/qi_lb60/config-2.6.37 @@ -15,3 +15,22 @@ CONFIG_SPI=y CONFIG_SPI_BITBANG=y CONFIG_SPI_GPIO=y CONFIG_SPI_MASTER=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_SEQUENCER=y +CONFIG_SND_SEQ_DUMMY=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +# CONFIG_SND_RAWMIDI_SEQ is not set +CONFIG_SND_SOC=y +CONFIG_SND_JZ4740_SOC=y +CONFIG_SND_JZ4740_SOC_QI_LB60=y +CONFIG_SND_JZ4740_SOC_I2S=y +CONFIG_SND_SOC_I2C_AND_SPI=y +CONFIG_SND_SOC_JZCODEC=y +# CONFIG_SND_VIRMIDI is not set +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +# CONFIG_SND_SEQUENCER_OSS is not set diff --git a/target/linux/xburst/qi_lb60/target.mk b/target/linux/xburst/qi_lb60/target.mk index 7477225c9..8ae71bd9c 100644 --- a/target/linux/xburst/qi_lb60/target.mk +++ b/target/linux/xburst/qi_lb60/target.mk @@ -1,8 +1 @@ BOARDNAME:=QI Ben Nanonote (qi_lb60) -DEFAULT_PACKAGES += \ - kmod-sound-core \ - kmod-sound-soc-core \ - kmod-sound-soc-jz4740 \ - kmod-sound-soc-jz4740-codec \ - kmod-sound-soc-qilb60 \ -