diff options
| -rw-r--r-- | mk/modules.mk | 7 | ||||
| -rw-r--r-- | target/linux/config/Config.in.audio | 16 | ||||
| -rw-r--r-- | target/linux/config/Config.in.graphics | 9 |
3 files changed, 17 insertions, 15 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index a7e031bea..ec983e80b 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1179,11 +1179,6 @@ $(eval $(call KMOD_template,SND_DMAENGINE_PCM,snd-dmaengine-pcm,\ $(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \ ,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,\ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(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-spdif \ $(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,\ $(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \ diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 23fe71b57..8417ac1f1 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -14,7 +14,7 @@ config ADK_KERNEL_SND_ARM boolean config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM - boolean + tristate config ADK_KERNEL_SND_DMAENGINE_PCM tristate @@ -22,6 +22,9 @@ config ADK_KERNEL_SND_DMAENGINE_PCM config ADK_KERNEL_SND_SOC_SPDIF tristate +config ADK_KERNEL_SND_SOC_FSL_ASRC + tristate + config ADK_KERNEL_SND_SOC_FSL_SPDIF tristate @@ -50,6 +53,9 @@ config ADK_KERNEL_SND_TIMER tristate config ADK_KERNEL_SND_PCM + select ADK_KERNEL_SND_TIMER + select ADK_KERNEL_SND_DMAENGINE_PCM + select ADK_KERNEL_SND_PCM_DMAENGINE tristate config ADK_KERNEL_SND_HWDEP @@ -78,14 +84,10 @@ config ADK_KERNEL_SND_SOC_PCM5102A config ADK_KERNEL_SND_PCM_DMAENGINE tristate -config ADK_KERNEL_SND_COMPRESS - tristate - config ADK_KERNEL_SND tristate select ADK_KERNEL_SOUND select ADK_KERNEL_SND_PCM - select ADK_KERNEL_SND_TIMER select ADK_KERNEL_SND_HWDEP default n @@ -163,7 +165,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S select ADK_KERNEL_SND_SOC select ADK_KERNEL_SND_DMAENGINE_PCM select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM - select ADK_KERNEL_SND_COMPRESS select ADK_KERNEL_REGMAP_MMIO select ADK_KERNEL_SND_SOC_PCM5102A depends on ADK_TARGET_SYSTEM_RASPBERRY_PI @@ -214,7 +215,6 @@ config ADK_KERNEL_SND_IMX_SOC tristate select ADK_KERNEL_SND select ADK_KERNEL_SND_SOC - select ADK_KERNEL_SND_COMPRESS select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM select ADK_KERNEL_SND_DMAENGINE_PCM 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_SPDIF 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_I2C select ADK_KERNEL_SND_PCM_DMAENGINE diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 02a72be47..ff5ab706e 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -64,7 +64,8 @@ config ADK_KERNEL_MXC_GPU_VIV boolean config ADK_KERNEL_MXC_ASRC - boolean + tristate + default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 config ADK_KERNEL_MXC_HDMI_CEC boolean @@ -228,9 +229,13 @@ config ADK_KERNEL_DRM_VIVANTE select ADK_KERNEL_FB_MXC_LDB select ADK_KERNEL_FB_MXC_SYNC_PANEL 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_GPU_VIV - select ADK_KERNEL_MXC_ASRC select ADK_KERNEL_MXC_HDMI_CEC select ADK_KERNEL_MXC_MIPI_CSI2 select ADK_KERNEL_MXC_MLB150 |