OSDN Git Service

ASoC: SOF: nocodec: fix undefined reference
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 10 May 2019 16:38:03 +0000 (11:38 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 13 May 2019 11:36:56 +0000 (12:36 +0100)
The nocodec option can be selected individually, leading to the following
issue:

sound/soc/sof/core.o: In function `snd_sof_device_probe':
core.c:(.text+0x4af): undefined reference to `sof_nocodec_setup'

Fix by selecting the SND_SOF_NOCODEC option as needed.

Reported-by: Hulk Robot <hulkci@huawei.com>
Reported-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/Kconfig

index b204c65..a9a1d50 100644 (file)
@@ -44,7 +44,10 @@ config SND_SOC_SOF_OPTIONS
 if SND_SOC_SOF_OPTIONS
 
 config SND_SOC_SOF_NOCODEC
-       tristate "SOF nocodec mode Support"
+       tristate
+
+config SND_SOC_SOF_NOCODEC_SUPPORT
+       bool "SOF nocodec mode support"
        help
          This adds support for a dummy/nocodec machine driver fallback
          option if no known codec is detected. This is typically only
@@ -80,7 +83,7 @@ if SND_SOC_SOF_DEBUG
 
 config SND_SOC_SOF_FORCE_NOCODEC_MODE
        bool "SOF force nocodec Mode"
-       depends on SND_SOC_SOF_NOCODEC
+       depends on SND_SOC_SOF_NOCODEC_SUPPORT
        help
          This forces SOF to use dummy/nocodec as machine driver, even
          though there is a codec detected on the real platform. This is
@@ -135,6 +138,7 @@ endif ## SND_SOC_SOF_OPTIONS
 config SND_SOC_SOF
        tristate
        select SND_SOC_TOPOLOGY
+       select SND_SOC_SOF_NOCODEC if SND_SOC_SOF_NOCODEC_SUPPORT
        help
          This option is not user-selectable but automagically handled by
          'select' statements at a higher level