Skip to content

app/stub*.conf: add CONFIG_SAMPLE_SMART_AMP=y #8425

Merged
kv2019i merged 4 commits intothesofproject:mainfrom
marc-hb:compile-sample-smart
Nov 2, 2023
Merged

app/stub*.conf: add CONFIG_SAMPLE_SMART_AMP=y #8425
kv2019i merged 4 commits intothesofproject:mainfrom
marc-hb:compile-sample-smart

Conversation

@marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Nov 1, 2023

4 very small commits but review commit by commit is required.

Don't be creative with weird "visible if" syntax.  Simply don't include
sub-Kconfig when the top-level option is disabled.

This removes "backdoors" like:

  -DCONFIG_SAMPLE_SMART_AMP=y -DCONFIG_SAMPLES=n

"In Rome, do as the Romans do"

Fixes commit 03b80ea ("audio: move test components into the
src/samples/audio dir")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This reverts commit fbde1dc.

Now that CONFIG_SAMPLE_SMART_AMP has a hard, menu dependency on
CONFIG_SAMPLES, we don't need to encode Kconfig dependencies in CMake
any more.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Fixes commit f06da57 ("smart_amp: add smart amplifier test
component") which added its COMP_TEST_SMART_AMP ancestor.

This code can compile without any hardware dependency;
`git show  ___ | grep include` does not show any.

This is useful for fuzzing etc.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
While one smart_amp C file does not compile, let's keep compile-checking
the other two.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Copy link
Collaborator

@kv2019i kv2019i left a comment

Choose a reason for hiding this comment

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

Thanks @marc-hb , looks all good!

@kv2019i kv2019i merged commit ba2cfe3 into thesofproject:main Nov 2, 2023
@kv2019i
Copy link
Collaborator

kv2019i commented Nov 3, 2023

@marc-hb @lgirdwood I don't understand why this happens, but I suspect that some this PR and #8426 , when both now merged, is causing IPC3 stub build fails in mainline now. Probably something simple, but shows up in every PR.

@marc-hb marc-hb deleted the compile-sample-smart branch November 3, 2023 16:54
@marc-hb
Copy link
Collaborator Author

marc-hb commented Nov 3, 2023

I made the same guess as @kv2019i . I will confirm and submit some solution today, one way or the other.

@marc-hb
Copy link
Collaborator Author

marc-hb commented Nov 3, 2023

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.

3 participants