From e4ef0572cce76c3b02e944f48635770c78ec1437 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Fri, 31 Jan 2025 12:48:14 +0200 Subject: [PATCH] UCM2: Blobs: SOF: Cleanup blob names from .blob to .bin The configuration blobs for SOF processing components are mixed with old filename suffix .blob and new .bin. This patch renames for cleanup the remaining .blob files to .bin to follow the chosen naming in SOF project. Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/504 Signed-off-by: Seppo Ingalsuo Signed-off-by: Jaroslav Kysela --- ucm2/Intel/sof-hda-dsp/dsp.conf | 12 ++++++------ ucm2/blobs/sof/ipc3/eq_fir/{pass.blob => pass.bin} | Bin ..._0db_48khz.blob => highpass_100hz_0db_48khz.bin} | Bin ...z_0db_48khz.blob => highpass_20hz_0db_48khz.bin} | Bin ...z_0db_48khz.blob => highpass_50hz_0db_48khz.bin} | Bin ucm2/blobs/sof/ipc3/eq_iir/{pass.blob => pass.bin} | Bin .../ipc4/drc/{passthrough.blob => passthrough.bin} | Bin .../{speaker_default.blob => speaker_default.bin} | Bin ucm2/blobs/sof/ipc4/eq_fir/{pass.blob => pass.bin} | Bin ..._0db_48khz.blob => highpass_100hz_0db_48khz.bin} | Bin ...z_0db_48khz.blob => highpass_20hz_0db_48khz.bin} | Bin ...z_0db_48khz.blob => highpass_50hz_0db_48khz.bin} | Bin ucm2/blobs/sof/ipc4/eq_iir/{pass.blob => pass.bin} | Bin ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf | 12 ++++++------ 14 files changed, 12 insertions(+), 12 deletions(-) rename ucm2/blobs/sof/ipc3/eq_fir/{pass.blob => pass.bin} (100%) rename ucm2/blobs/sof/ipc3/eq_iir/{highpass_100hz_0db_48khz.blob => highpass_100hz_0db_48khz.bin} (100%) rename ucm2/blobs/sof/ipc3/eq_iir/{highpass_20hz_0db_48khz.blob => highpass_20hz_0db_48khz.bin} (100%) rename ucm2/blobs/sof/ipc3/eq_iir/{highpass_50hz_0db_48khz.blob => highpass_50hz_0db_48khz.bin} (100%) rename ucm2/blobs/sof/ipc3/eq_iir/{pass.blob => pass.bin} (100%) rename ucm2/blobs/sof/ipc4/drc/{passthrough.blob => passthrough.bin} (100%) rename ucm2/blobs/sof/ipc4/drc/{speaker_default.blob => speaker_default.bin} (100%) rename ucm2/blobs/sof/ipc4/eq_fir/{pass.blob => pass.bin} (100%) rename ucm2/blobs/sof/ipc4/eq_iir/{highpass_100hz_0db_48khz.blob => highpass_100hz_0db_48khz.bin} (100%) rename ucm2/blobs/sof/ipc4/eq_iir/{highpass_20hz_0db_48khz.blob => highpass_20hz_0db_48khz.bin} (100%) rename ucm2/blobs/sof/ipc4/eq_iir/{highpass_50hz_0db_48khz.blob => highpass_50hz_0db_48khz.bin} (100%) rename ucm2/blobs/sof/ipc4/eq_iir/{pass.blob => pass.bin} (100%) diff --git a/ucm2/Intel/sof-hda-dsp/dsp.conf b/ucm2/Intel/sof-hda-dsp/dsp.conf index 6e14ae1..d2c95be 100644 --- a/ucm2/Intel/sof-hda-dsp/dsp.conf +++ b/ucm2/Intel/sof-hda-dsp/dsp.conf @@ -110,12 +110,12 @@ If.SOFPath { Condition { Type AlwaysTrue } True.Define { BlobPath "${ConfTopDir}/blobs/sof/${var:SOFIPCVer}" - PostMixerAnalogPlaybackSpeakerIirBlob "${var:BlobPath}/eq_iir/highpass_100hz_0db_48khz.blob" - PostMixerAnalogPlaybackSpeakerFirBlob "${var:BlobPath}/eq_fir/pass.blob" - PostMixerAnalogPlaybackSpeakerDrcBlob "${var:BlobPath}/drc/speaker_default.blob" - PostMixerAnalogPlaybackHeadphoneIirBlob "${var:BlobPath}/eq_iir/pass.blob" - PostMixerAnalogPlaybackHeadphoneFirBlob "${var:BlobPath}/eq_fir/pass.blob" - PostMixerAnalogPlaybackHeadphoneDrcBlob "${var:BlobPath}/drc/passthrough.blob" + PostMixerAnalogPlaybackSpeakerIirBlob "${var:BlobPath}/eq_iir/highpass_100hz_0db_48khz.bin" + PostMixerAnalogPlaybackSpeakerFirBlob "${var:BlobPath}/eq_fir/pass.bin" + PostMixerAnalogPlaybackSpeakerDrcBlob "${var:BlobPath}/drc/speaker_default.bin" + PostMixerAnalogPlaybackHeadphoneIirBlob "${var:BlobPath}/eq_iir/pass.bin" + PostMixerAnalogPlaybackHeadphoneFirBlob "${var:BlobPath}/eq_fir/pass.bin" + PostMixerAnalogPlaybackHeadphoneDrcBlob "${var:BlobPath}/drc/passthrough.bin" # Leave Dmic0 default blobs empty to not override blobs in topology by default. # The DMI ID based customization in blobs/sof/user_configs or # blobs/sof/product_configs may set these as FixedBootConfig. diff --git a/ucm2/blobs/sof/ipc3/eq_fir/pass.blob b/ucm2/blobs/sof/ipc3/eq_fir/pass.bin similarity index 100% rename from ucm2/blobs/sof/ipc3/eq_fir/pass.blob rename to ucm2/blobs/sof/ipc3/eq_fir/pass.bin diff --git a/ucm2/blobs/sof/ipc3/eq_iir/highpass_100hz_0db_48khz.blob b/ucm2/blobs/sof/ipc3/eq_iir/highpass_100hz_0db_48khz.bin similarity index 100% rename from ucm2/blobs/sof/ipc3/eq_iir/highpass_100hz_0db_48khz.blob rename to ucm2/blobs/sof/ipc3/eq_iir/highpass_100hz_0db_48khz.bin diff --git a/ucm2/blobs/sof/ipc3/eq_iir/highpass_20hz_0db_48khz.blob b/ucm2/blobs/sof/ipc3/eq_iir/highpass_20hz_0db_48khz.bin similarity index 100% rename from ucm2/blobs/sof/ipc3/eq_iir/highpass_20hz_0db_48khz.blob rename to ucm2/blobs/sof/ipc3/eq_iir/highpass_20hz_0db_48khz.bin diff --git a/ucm2/blobs/sof/ipc3/eq_iir/highpass_50hz_0db_48khz.blob b/ucm2/blobs/sof/ipc3/eq_iir/highpass_50hz_0db_48khz.bin similarity index 100% rename from ucm2/blobs/sof/ipc3/eq_iir/highpass_50hz_0db_48khz.blob rename to ucm2/blobs/sof/ipc3/eq_iir/highpass_50hz_0db_48khz.bin diff --git a/ucm2/blobs/sof/ipc3/eq_iir/pass.blob b/ucm2/blobs/sof/ipc3/eq_iir/pass.bin similarity index 100% rename from ucm2/blobs/sof/ipc3/eq_iir/pass.blob rename to ucm2/blobs/sof/ipc3/eq_iir/pass.bin diff --git a/ucm2/blobs/sof/ipc4/drc/passthrough.blob b/ucm2/blobs/sof/ipc4/drc/passthrough.bin similarity index 100% rename from ucm2/blobs/sof/ipc4/drc/passthrough.blob rename to ucm2/blobs/sof/ipc4/drc/passthrough.bin diff --git a/ucm2/blobs/sof/ipc4/drc/speaker_default.blob b/ucm2/blobs/sof/ipc4/drc/speaker_default.bin similarity index 100% rename from ucm2/blobs/sof/ipc4/drc/speaker_default.blob rename to ucm2/blobs/sof/ipc4/drc/speaker_default.bin diff --git a/ucm2/blobs/sof/ipc4/eq_fir/pass.blob b/ucm2/blobs/sof/ipc4/eq_fir/pass.bin similarity index 100% rename from ucm2/blobs/sof/ipc4/eq_fir/pass.blob rename to ucm2/blobs/sof/ipc4/eq_fir/pass.bin diff --git a/ucm2/blobs/sof/ipc4/eq_iir/highpass_100hz_0db_48khz.blob b/ucm2/blobs/sof/ipc4/eq_iir/highpass_100hz_0db_48khz.bin similarity index 100% rename from ucm2/blobs/sof/ipc4/eq_iir/highpass_100hz_0db_48khz.blob rename to ucm2/blobs/sof/ipc4/eq_iir/highpass_100hz_0db_48khz.bin diff --git a/ucm2/blobs/sof/ipc4/eq_iir/highpass_20hz_0db_48khz.blob b/ucm2/blobs/sof/ipc4/eq_iir/highpass_20hz_0db_48khz.bin similarity index 100% rename from ucm2/blobs/sof/ipc4/eq_iir/highpass_20hz_0db_48khz.blob rename to ucm2/blobs/sof/ipc4/eq_iir/highpass_20hz_0db_48khz.bin diff --git a/ucm2/blobs/sof/ipc4/eq_iir/highpass_50hz_0db_48khz.blob b/ucm2/blobs/sof/ipc4/eq_iir/highpass_50hz_0db_48khz.bin similarity index 100% rename from ucm2/blobs/sof/ipc4/eq_iir/highpass_50hz_0db_48khz.blob rename to ucm2/blobs/sof/ipc4/eq_iir/highpass_50hz_0db_48khz.bin diff --git a/ucm2/blobs/sof/ipc4/eq_iir/pass.blob b/ucm2/blobs/sof/ipc4/eq_iir/pass.bin similarity index 100% rename from ucm2/blobs/sof/ipc4/eq_iir/pass.blob rename to ucm2/blobs/sof/ipc4/eq_iir/pass.bin diff --git a/ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf b/ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf index 671a3db..9a6e96d 100644 --- a/ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf +++ b/ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf @@ -2,9 +2,9 @@ # Note: Use the correct IPC version for the blobs path # Example set all processing to bypass -#Define.PostMixerAnalogPlaybackSpeakerIirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_iir/pass.blob" -#Define.PostMixerAnalogPlaybackSpeakerFirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_fir/pass.blob" -#Define.PostMixerAnalogPlaybackSpeakerDrcBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/drc/passthrough.blob" -#Define.PostMixerAnalogPlaybackHeadphoneIirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_iir/pass.blob" -#Define.PostMixerAnalogPlaybackHeadphoneFirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_fir/pass.blob" -#Define.PostMixerAnalogPlaybackHeadphoneDrcBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/drc/passthrough.blob" +#Define.PostMixerAnalogPlaybackSpeakerIirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_iir/pass.bin" +#Define.PostMixerAnalogPlaybackSpeakerFirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_fir/pass.bin" +#Define.PostMixerAnalogPlaybackSpeakerDrcBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/drc/passthrough.bin" +#Define.PostMixerAnalogPlaybackHeadphoneIirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_iir/pass.bin" +#Define.PostMixerAnalogPlaybackHeadphoneFirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_fir/pass.bin" +#Define.PostMixerAnalogPlaybackHeadphoneDrcBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/drc/passthrough.bin" -- 2.47.1