Skip to content

Conversation

@kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Sep 12, 2025

Part 2, follow-up to #10209

After this series, typical Intel DSP board file has now 50% less settings (versus baseline without any shared definitions).

There will be still part 3 coming, but that is focusing on the audio module defaults after introduction of LLEXT/MODULES, so that is probably easier to review as a separate PR.

The defconfig mechanism cannot be used to set all common build
options as Zephyr Kconfig does not allow to override defaults that
have been already set. E.g. CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP
and CONFIG_LOG_FLUSH_SLEEP_US=5000 are common for Intel DSPs,
but as these both have defaults set in the Zephyr Kconfig definition,
we cannot set a new default via defconfig mechanism. Instead
the setting must be set in each board file separately.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Move common Zephyr logging configuration options to the shared
file for Intel DSPs.

Not all options can be moved as we cannot assign defaults to settings
that already have a default (e.g.
CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP).

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Remove unnecessary 'n' defaults in sof/zephyr Kconfig. This doesn't affect
any current build as 'n' is the default if not set otherwise.

By removing the unconditional defaults, it becomes possible to set
defaults later in board/family specific Kconfig.defconfig files.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Remove unnecessary 'n' defaults in sof/src/plaform Kconfig. This doesn't
affect any current build as 'n' is the default if not set otherwise.

By removing the unconditional defaults, it becomes possible to set
defaults later in board/family specific Kconfig.defconfig files.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This pull request continues the effort to consolidate common audio build options for Intel ADSP platforms by centralizing shared configuration settings. The changes build upon previous work to reduce duplication across Intel DSP board configuration files.

Key changes:

  • Removes redundant "default n" statements from Kconfig files since they are implicit
  • Creates a new shared defconfig file for all Intel ADSP platforms with common defaults
  • Removes numerous duplicated configuration entries from individual board configuration files

Reviewed Changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated no comments.

File Description
zephyr/Kconfig Removes redundant "default n" statements for various configuration options
src/platform/Kconfig Removes redundant "default n" statements from platform configuration options
app/boards/intel_adsp/Kconfig.defconfig New shared defconfig file containing common defaults for all Intel ADSP SOF targets
app/boards/intel_adsp_*.conf Multiple board configuration files with removed duplicated settings now handled by shared defconfig
Comments suppressed due to low confidence (2)

app/boards/intel_adsp_ace40_nvls.conf:1

  • The CONFIG_ZEPHYR_NATIVE_DRIVERS setting is removed from this file but should be kept since it's being set to a non-default value according to the new defconfig file where this defaults to y. However, this line appears to be incorrectly removed when it should remain.
CONFIG_NOVALAKE=y

app/boards/intel_adsp_ace40_nvl.conf:1

  • The CONFIG_ZEPHYR_NATIVE_DRIVERS setting is removed from this file but should be kept since it's being set to a non-default value according to the new defconfig file where this defaults to y. However, this line appears to be incorrectly removed when it should remain.
CONFIG_NOVALAKE=y

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@lgirdwood
Copy link
Member

@kv2019i can you check CI, Thanks !

@kv2019i
Copy link
Collaborator Author

kv2019i commented Sep 15, 2025

Ack, @lgirdwood now all required CI passes. Only known fails in Intel jenkins CI runs.

Copy link
Member

@abonislawski abonislawski left a comment

Choose a reason for hiding this comment

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

Please double check PM changes

Copy link
Contributor

@tmleman tmleman left a comment

Choose a reason for hiding this comment

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

LGTM

@kv2019i
Copy link
Collaborator Author

kv2019i commented Sep 19, 2025

@lgirdwood this is ready, but I'm now holding off merge as this would conflict with sounddose. that probably has prioritygo in first

Move common SOF instrastucture configuration options to the shared
defconfigfile for Intel DSPs.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Move common SOF logging configuration options to the shared
defconfig file for Intel DSPs.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Move common settings for CONFIG_CLOCK_CONTROL_* to the shared defconfig
file Intel DSPs.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Move common Zephyr driver options to the shared defconfig file for Intel
DSPs.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Move CONFIG_PM_* options that are shared for all Intel DSPs to
the shared defconfig file.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
Copy link
Collaborator Author

kv2019i commented Sep 26, 2025

There starts to be multiple other PRs that will soon conflict, so let's merge this now as this has a clean CI run.

@kv2019i kv2019i merged commit efbc7c4 into thesofproject:main Sep 26, 2025
34 of 45 checks passed
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.

5 participants