Home Explore Help
Register Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 1 Pull Requests 0 Wiki
Browse Source

fix audio kernel module build problems

Waldemar Brodkorb 10 years ago
parent
d18efce498
commit
b60e85f065
3 changed files with 17 additions and 15 deletions
Unified View Show Diff Stats
  1. 1 6
      mk/modules.mk
  2. 9 7
      target/linux/config/Config.in.audio
  3. 7 2
      target/linux/config/Config.in.graphics

+ 1 - 6
mk/modules.mk
View File 

@@ -1179,11 +1179,6 @@ $(eval $(call KMOD_template,SND_DMAENGINE_PCM,snd-dmaengine-pcm,\
 
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \
 
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \
 
 ,45))
 
 ,45))
 
 
 
-
 
-$(eval $(call KMOD_template,SND_COMPRESS,snd-compress,\
 
-	$(MODULES_DIR)/kernel/sound/core/snd-compress \
 
-,45))
 
-
 
 $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
 
 $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
 
 	$(MODULES_DIR)/kernel/sound/core/snd-hwdep \
 
 	$(MODULES_DIR)/kernel/sound/core/snd-hwdep \
 
 	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
 
 	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
 
@@ -1254,7 +1249,7 @@ $(eval $(call KMOD_template,SND_IMX_SOC,snd-imx-soc,\
 
 	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-hdmi \
 
 	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-hdmi \
 
 	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-spdif \
 
 	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-spdif \
 
 	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-sgtl5000 \
 
 	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-sgtl5000 \
 
-,60, kmod-snd-soc kmod-snd-compress))
 
+,60, kmod-snd-soc))
 
 
 
 $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 
 $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 
 	$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
 
 	$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \

+ 9 - 7
target/linux/config/Config.in.audio
View File 

@@ -14,7 +14,7 @@ config ADK_KERNEL_SND_ARM
 
 	boolean
 
 	boolean
 
 
 
 config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 
 config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 
-	boolean
 
+	tristate
 
 
 
 config ADK_KERNEL_SND_DMAENGINE_PCM
 
 config ADK_KERNEL_SND_DMAENGINE_PCM
 
 	tristate
 
 	tristate
 
@@ -22,6 +22,9 @@ config ADK_KERNEL_SND_DMAENGINE_PCM
 
 config ADK_KERNEL_SND_SOC_SPDIF
 
 config ADK_KERNEL_SND_SOC_SPDIF
 
 	tristate
 
 	tristate
 
 
 
+config ADK_KERNEL_SND_SOC_FSL_ASRC
 
+	tristate
 
+
 
 config ADK_KERNEL_SND_SOC_FSL_SPDIF
 
 config ADK_KERNEL_SND_SOC_FSL_SPDIF
 
 	tristate
 
 	tristate
 
 
 
@@ -50,6 +53,9 @@ config ADK_KERNEL_SND_TIMER
 
 	tristate
 
 	tristate
 
 
 
 config ADK_KERNEL_SND_PCM
 
 config ADK_KERNEL_SND_PCM
 
+	select ADK_KERNEL_SND_TIMER
 
+	select ADK_KERNEL_SND_DMAENGINE_PCM
 
+	select ADK_KERNEL_SND_PCM_DMAENGINE
 
 	tristate
 
 	tristate
 
 
 
 config ADK_KERNEL_SND_HWDEP
 
 config ADK_KERNEL_SND_HWDEP
 
@@ -78,14 +84,10 @@ config ADK_KERNEL_SND_SOC_PCM5102A
 
 config ADK_KERNEL_SND_PCM_DMAENGINE
 
 config ADK_KERNEL_SND_PCM_DMAENGINE
 
 	tristate
 
 	tristate
 
 
 
-config ADK_KERNEL_SND_COMPRESS
 
-	tristate
 
-
 
 config ADK_KERNEL_SND
 
 config ADK_KERNEL_SND
 
 	tristate
 
 	tristate
 
 	select ADK_KERNEL_SOUND
 
 	select ADK_KERNEL_SOUND
 
 	select ADK_KERNEL_SND_PCM
 
 	select ADK_KERNEL_SND_PCM
 
-	select ADK_KERNEL_SND_TIMER
 
 	select ADK_KERNEL_SND_HWDEP
 
 	select ADK_KERNEL_SND_HWDEP
 
 	default n
 
 	default n
 
 
 
@@ -163,7 +165,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
 
 	select ADK_KERNEL_SND_SOC
 
 	select ADK_KERNEL_SND_SOC
 
 	select ADK_KERNEL_SND_DMAENGINE_PCM
 
 	select ADK_KERNEL_SND_DMAENGINE_PCM
 
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 
-	select ADK_KERNEL_SND_COMPRESS
 
 	select ADK_KERNEL_REGMAP_MMIO
 
 	select ADK_KERNEL_REGMAP_MMIO
 
 	select ADK_KERNEL_SND_SOC_PCM5102A
 
 	select ADK_KERNEL_SND_SOC_PCM5102A
 
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 
@@ -214,7 +215,6 @@ config ADK_KERNEL_SND_IMX_SOC
 
 	tristate
 
 	tristate
 
 	select ADK_KERNEL_SND
 
 	select ADK_KERNEL_SND
 
 	select ADK_KERNEL_SND_SOC
 
 	select ADK_KERNEL_SND_SOC
 
-	select ADK_KERNEL_SND_COMPRESS
 
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 
 	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 
 	select ADK_KERNEL_SND_DMAENGINE_PCM
 
 	select ADK_KERNEL_SND_DMAENGINE_PCM
 
 	select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
 
 	select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
 
@@ -222,6 +222,8 @@ config ADK_KERNEL_SND_IMX_SOC
 
 	select ADK_KERNEL_SND_SOC_IMX_HDMI
 
 	select ADK_KERNEL_SND_SOC_IMX_HDMI
 
 	select ADK_KERNEL_SND_SOC_IMX_SPDIF
 
 	select ADK_KERNEL_SND_SOC_IMX_SPDIF
 
 	select ADK_KERNEL_SND_SOC_IMX_SGTL5000
 
 	select ADK_KERNEL_SND_SOC_IMX_SGTL5000
 
+	select ADK_KERNEL_SND_SOC_FSL_ASRC
 
+	select ADK_KERNEL_SND_SOC_FSL_SPDIF
 
 	select ADK_KERNEL_REGMAP_SPI
 
 	select ADK_KERNEL_REGMAP_SPI
 
 	select ADK_KERNEL_REGMAP_I2C
 
 	select ADK_KERNEL_REGMAP_I2C
 
 	select ADK_KERNEL_SND_PCM_DMAENGINE
 
 	select ADK_KERNEL_SND_PCM_DMAENGINE

+ 7 - 2
target/linux/config/Config.in.graphics
View File 

@@ -64,7 +64,8 @@ config ADK_KERNEL_MXC_GPU_VIV
 
  	boolean
 
  	boolean
 
 
 
 config ADK_KERNEL_MXC_ASRC
 
 config ADK_KERNEL_MXC_ASRC
 
- 	boolean
 
+ 	tristate
 
+	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 
 
 
 config ADK_KERNEL_MXC_HDMI_CEC
 
 config ADK_KERNEL_MXC_HDMI_CEC
 
  	boolean
 
  	boolean
 
@@ -228,9 +229,13 @@ config ADK_KERNEL_DRM_VIVANTE
 
 	select ADK_KERNEL_FB_MXC_LDB
 
 	select ADK_KERNEL_FB_MXC_LDB
 
 	select ADK_KERNEL_FB_MXC_SYNC_PANEL
 
 	select ADK_KERNEL_FB_MXC_SYNC_PANEL
 
 	select ADK_KERNEL_FB_MXC_HDMI
 
 	select ADK_KERNEL_FB_MXC_HDMI
 
+	select ADK_KERNEL_SND
 
+	select ADK_KERNEL_SND_PCM
 
+	select ADK_KERNEL_SND_DMAENGINE_PCM
 
+	select ADK_KERNEL_SND_SOC
 
+	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 
 	select ADK_KERNEL_MXC_IPU
 
 	select ADK_KERNEL_MXC_IPU
 
 	select ADK_KERNEL_MXC_GPU_VIV
 
 	select ADK_KERNEL_MXC_GPU_VIV
 
-	select ADK_KERNEL_MXC_ASRC
 
 	select ADK_KERNEL_MXC_HDMI_CEC
 
 	select ADK_KERNEL_MXC_HDMI_CEC
 
 	select ADK_KERNEL_MXC_MIPI_CSI2
 
 	select ADK_KERNEL_MXC_MIPI_CSI2
 
 	select ADK_KERNEL_MXC_MLB150
 
 	select ADK_KERNEL_MXC_MLB150