lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 197/350] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit f9ad75468453b019b92c5296e6a04bf7c37f49e4 ]

    updated solution to the problem reported with randconfig:

    CONFIG_SND_SOC_SOF_IMX depends on CONFIG_SND_SOC_SOF, but is in
    turn referenced by the sof-of-dev driver. This creates a reverse
    dependency that manifests in a link error when CONFIG_SND_SOC_SOF_OF
    is built-in but CONFIG_SND_SOC_SOF_IMX=m:

    sound/soc/sof/sof-of-dev.o:(.data+0x118): undefined reference to `sof_imx8_ops'

    use def_trisate to propagate the right settings without select.

    Fixes: f4df4e4042b0 ("ASoC: SOF: imx8: Fix COMPILE_TEST error")
    Fixes: 202acc565a1f ("ASoC: SOF: imx: Add i.MX8 HW support")
    Suggested-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20191101173045.27099-6-pierre-louis.bossart@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/sof/imx/Kconfig | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig
    index 5acae75f5750d..71f318bc2c74f 100644
    --- a/sound/soc/sof/imx/Kconfig
    +++ b/sound/soc/sof/imx/Kconfig
    @@ -11,8 +11,8 @@ config SND_SOC_SOF_IMX_TOPLEVEL

    if SND_SOC_SOF_IMX_TOPLEVEL

    -config SND_SOC_SOF_IMX8
    - tristate "SOF support for i.MX8"
    +config SND_SOC_SOF_IMX8_SUPPORT
    + bool "SOF support for i.MX8"
    depends on IMX_SCU
    depends on IMX_DSP
    help
    @@ -20,4 +20,8 @@ config SND_SOC_SOF_IMX8
    Say Y if you have such a device.
    If unsure select "N".

    +config SND_SOC_SOF_IMX8
    + def_tristate SND_SOC_SOF_OF
    + depends on SND_SOC_SOF_IMX8_SUPPORT
    +
    endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-10 22:24    [W:2.033 / U:1.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site