From bf11017631d506dc4ae156e6f8ffb350bef53914 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Wed, 24 Apr 2024 14:20:30 -0500 Subject: [PATCH] soundwire-defconfig: split codecs so soundwire-codecs-defconfig This split allows for codecs to be selected only on the basis of machine drivers selected, or conversely to be all included for developers. kconfig-sof-default-nodev.sh now includes only the bare minimum for SOF. Signed-off-by: Pierre-Louis Bossart --- kconfig-distro-sof-dev-update.sh | 1 + kconfig-sof-default-nodev.sh | 19 +++++++++++++++++++ kconfig-sof-default.sh | 1 + soundwire-codecs-defconfig | 24 ++++++++++++++++++++++++ soundwire-defconfig | 14 -------------- 5 files changed, 45 insertions(+), 14 deletions(-) create mode 100755 kconfig-sof-default-nodev.sh create mode 100644 soundwire-codecs-defconfig diff --git a/kconfig-distro-sof-dev-update.sh b/kconfig-distro-sof-dev-update.sh index 5bbdfb7..1f8edfd 100755 --- a/kconfig-distro-sof-dev-update.sh +++ b/kconfig-distro-sof-dev-update.sh @@ -19,4 +19,5 @@ $COMMAND .config \ $KCONFIG_DIR/hdaudio-codecs-defconfig \ $KCONFIG_DIR/lock-stall-defconfig \ $KCONFIG_DIR/soundwire-defconfig \ + $KCONFIG_DIR/soundwire-codecs-defconfig \ $@ diff --git a/kconfig-sof-default-nodev.sh b/kconfig-sof-default-nodev.sh new file mode 100755 index 0000000..6f43abe --- /dev/null +++ b/kconfig-sof-default-nodev.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +set -e + +KCONFIG_DIR=$(dirname ${BASH_SOURCE[0]}) +echo $KCONFIG_DIR + +. $KCONFIG_DIR/kconfig-lib.sh + +make defconfig +$COMMAND .config \ + $KCONFIG_DIR/base-defconfig \ + $KCONFIG_DIR/devices-defconfig \ + $KCONFIG_DIR/sof-defconfig \ + $KCONFIG_DIR/amd-defconfig \ + $KCONFIG_DIR/mach-driver-defconfig \ + $KCONFIG_DIR/hdaudio-codecs-defconfig \ + $KCONFIG_DIR/soundwire-defconfig \ + $@ diff --git a/kconfig-sof-default.sh b/kconfig-sof-default.sh index 5fa551e..929b83f 100755 --- a/kconfig-sof-default.sh +++ b/kconfig-sof-default.sh @@ -20,5 +20,6 @@ $COMMAND .config \ $KCONFIG_DIR/telemetry-debugfs-defconfig \ $KCONFIG_DIR/lock-stall-defconfig \ $KCONFIG_DIR/soundwire-defconfig \ + $KCONFIG_DIR/soundwire-codecs-defconfig \ $KCONFIG_DIR/bpf-defconfig \ $@ diff --git a/soundwire-codecs-defconfig b/soundwire-codecs-defconfig new file mode 100644 index 0000000..6fe9969 --- /dev/null +++ b/soundwire-codecs-defconfig @@ -0,0 +1,24 @@ +# add codecs so that they are compiled even if no machine +# drivers are selected +CONFIG_MFD_CS42L43_SDW=m +CONFIG_SND_SOC_CS35L56_SDW=m +CONFIG_SND_SOC_CS42L42_SDW=m +CONFIG_SND_SOC_CS42L43_SDW=m +CONFIG_SND_SOC_MAX98373_SDW=m + +CONFIG_SND_SOC_RT1017_SDCA_SDW=m +CONFIG_SND_SOC_RT1308_SDW=m +CONFIG_SND_SOC_RT1316_SDW=m +CONFIG_SND_SOC_RT1318_SDW=m +CONFIG_SND_SOC_RT5682_SDW=m +CONFIG_SND_SOC_RT700_SDW=m +CONFIG_SND_SOC_RT711_SDW=m +CONFIG_SND_SOC_RT711_SDCA_SDW=m +CONFIG_SND_SOC_RT712_SDCA_SDW=m +CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW=m +CONFIG_SND_SOC_RT722_SDCA_SDW=m +CONFIG_SND_SOC_RT715_SDW=m +CONFIG_SND_SOC_RT715_SDCA_SDW=m + +# SoundWire mockup codec +CONFIG_SND_SOC_SDW_MOCKUP=m diff --git a/soundwire-defconfig b/soundwire-defconfig index a5ccb3e..ee822f0 100644 --- a/soundwire-defconfig +++ b/soundwire-defconfig @@ -1,17 +1,3 @@ CONFIG_SOUNDWIRE=m CONFIG_SOUNDWIRE_INTEL=m CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m - -# add codecs so that they are compiled even if no machine -# drivers are selected -CONFIG_SND_SOC_RT700_SDW=m -CONFIG_SND_SOC_RT711_SDW=m -CONFIG_SND_SOC_RT1308_SDW=m -CONFIG_SND_SOC_RT715_SDW=m -CONFIG_SND_SOC_RT711_SDCA_SDW=m -CONFIG_SND_SOC_RT1316_SDW=m -CONFIG_SND_SOC_RT1318_SDW=m -CONFIG_SND_SOC_RT715_SDCA_SDW=m - -# SoundWire mockup codec -CONFIG_SND_SOC_SDW_MOCKUP=m