Skip to content

Fix SOF kconfigs - #445

Merged
plbossart merged 5 commits into
thesofproject:topic/sof-devfrom
plbossart:fix/friday-janitor-work
Dec 17, 2018
Merged

plbossart merged 5 commits into
thesofproject:topic/sof-devfrom
plbossart:fix/friday-janitor-work

Conversation

@plbossart

Copy link
Copy Markdown
Member

Fix #443

New kconfigs are needed for this (already available at thesofproject/kconfig@ac4824c)

Please check, test and let me know if you find any regression.

There's no code change so it should be transparent

Missing linux/io.h and linux/modules.h

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
asm/iosf-mbi.h only exists for X86, add dependency

TODO: move is_byt_cr() to common helper

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
linux/pci.h is needed

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
The existing module dependencies are handled in the wrong way.  We
need to select first acpi/pci, then platforms and last the core.
Doing otherwise would result in broken configurations where acpi/pci
stuff is compiled as built-in and platforms or SOF core as a module.

Rebuild Kconfig to use 'select' statements in the right order. The
platform selections are now exposed with booleans only. The choice of
module or built-in can now happen only at the pci/acpi/spi level, the
dependencies will be compiled accordingly. As a result, "make
menuconfig" does not expose how dependencies are handled.

Corner cases:
PCI is required for sof-pci-dev, devm_pci_enable is not defined otherwise.
ACPI and SOF_INTEL_TOPLEVEL can be enabled for COMPILE_TEST

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
s/SND_SOF_SOC_INTEL/SND_SOC_SOF_INTEL_TOPLEVEL

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
@plbossart
plbossart force-pushed the fix/friday-janitor-work branch from eb6cce1 to 2ad71b9 Compare December 15, 2018 04:02

@RanderWang RanderWang left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to add CONFIG_X86 for header files of intel?

#ifdef CONFIG_X86

/* platform specific devices */
#include "intel/shim.h"
#include "intel/hda.h"

#endif

@@ -10,6 +10,7 @@

#include <linux/firmware.h>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to refine following header files for intel?

#ifdef CONFIG_X86

/* platform specific devices */
#include "intel/shim.h"
#include "intel/hda.h"

#endif

@RanderWang RanderWang left a comment •

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about here "intel/shim.h" in sound/soc/sof/sof-acpi-dev.c ? I am not sure whether this file is a generic file for all vendors.

@plbossart

plbossart commented Dec 17, 2018 via email

Copy link
Copy Markdown
Member Author

@plbossart

Copy link
Copy Markdown
Member Author

No objection so merging now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants