In message: [kernel-cache][yocto-6.18][master][PATCH v2 28/38] sound_x86.scc: take over x86 configs from sound.scc on 29/01/2026 Mikko Rapeli wrote:
> Many of the sound.cfg configs were x86 specific. Move > all these to sound_x86.cfg to be used via sound_x86.scc. > Convert in-tree x86 users from sound.scc to sound_x86.scc. > Additionally x86 qemu machines in openembedded-core need > to be changed in kernel recipes to use sound_x86.scc instead > of sound.scc. > > The x86 specific configs don't make sense on other platforms > like arm/arm64 but cause warnings there, and the configs get > disabled from effective kernel config due to dependencies. I guess I didn't need to do that explanation earlier, this is exactly what I was describing. Bruce > > Signed-off-by: Mikko Rapeli <[email protected]> > --- > bsp/amd-x86/amd-x86-64.scc | 2 +- > bsp/intel-common/intel-common-drivers.scc | 2 +- > bsp/intel-x86/intel-x86.scc | 2 +- > cfg/sound.cfg | 20 -------------------- > cfg/sound_x86.cfg | 21 +++++++++++++++++++++ > cfg/sound_x86.scc | 6 ++++++ > kern-features.rc | 1 + > 7 files changed, 31 insertions(+), 23 deletions(-) > create mode 100644 cfg/sound_x86.cfg > create mode 100644 cfg/sound_x86.scc > > diff --git a/bsp/amd-x86/amd-x86-64.scc b/bsp/amd-x86/amd-x86-64.scc > index 87f23b51db70..a973208f5b70 100644 > --- a/bsp/amd-x86/amd-x86-64.scc > +++ b/bsp/amd-x86/amd-x86-64.scc > @@ -4,7 +4,7 @@ include cfg/x86_64.scc > > include cfg/vesafb.scc > include cfg/8250.scc > -include cfg/sound.scc > +include cfg/sound_x86.scc > include cfg/efi-ext.scc > include cfg/virtio.scc > include cfg/boot-live.scc > diff --git a/bsp/intel-common/intel-common-drivers.scc > b/bsp/intel-common/intel-common-drivers.scc > index 17e1505c335e..3e3fb50725df 100644 > --- a/bsp/intel-common/intel-common-drivers.scc > +++ b/bsp/intel-common/intel-common-drivers.scc > @@ -13,7 +13,7 @@ kconf hardware bsp/common-pc/common-pc-gfx.cfg > kconf hardware bsp/common-pc/common-pc-wifi.cfg > > # OSS sound support > -include cfg/sound.scc > +include cfg/sound_x86.scc > > # PCI > include features/pci/pci.scc > diff --git a/bsp/intel-x86/intel-x86.scc b/bsp/intel-x86/intel-x86.scc > index 233ce591031b..9f1e2c53c0a5 100644 > --- a/bsp/intel-x86/intel-x86.scc > +++ b/bsp/intel-x86/intel-x86.scc > @@ -4,7 +4,7 @@ > include cfg/vesafb.scc > include cfg/usb-mass-storage.scc > include cfg/8250.scc > -include cfg/sound.scc > +include cfg/sound_x86.scc > include cfg/efi-ext.scc > include cfg/boot-live.scc > include cfg/intel.scc > diff --git a/cfg/sound.cfg b/cfg/sound.cfg > index af261bd0c06c..604f1da37e75 100644 > --- a/cfg/sound.cfg > +++ b/cfg/sound.cfg > @@ -44,15 +44,6 @@ CONFIG_SND_HDA_CODEC_VIA=m > CONFIG_SND_SOC_AC97_BUS=y > CONFIG_SND_SOC_COMPRESS=y > CONFIG_SND_SOC_AMD_ACP=m > -CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m > -CONFIG_SND_SOC_INTEL_HASWELL=m > -CONFIG_SND_SOC_INTEL_HASWELL_MACH=m > -CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m > -CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m > -CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m > -CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m > -CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m > -CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m > CONFIG_SND_SOC_AC97_CODEC=m > CONFIG_SND_SOC_AK4104=m > CONFIG_SND_SOC_AK4554=m > @@ -90,13 +81,10 @@ CONFIG_SND_SOC_PCM512x=m > CONFIG_SND_SOC_PCM512x_I2C=m > CONFIG_SND_SOC_PCM512x_SPI=m > CONFIG_SND_SOC_RL6231=m > -CONFIG_SND_SOC_RT298=m > CONFIG_SND_SOC_RT5616=m > CONFIG_SND_SOC_RT5631=m > CONFIG_SND_SOC_RT5640=m > CONFIG_SND_SOC_RT5645=m > -CONFIG_SND_SOC_RT5651=m > -CONFIG_SND_SOC_RT5670=m > CONFIG_SND_SOC_SPDIF=m > CONFIG_SND_SOC_SSM4567=m > CONFIG_SND_SOC_TLV320AIC31XX=m > @@ -129,12 +117,4 @@ CONFIG_SND_SIMPLE_CARD_UTILS=m > CONFIG_SND_SIMPLE_CARD=m > CONFIG_SND_USB=y > CONFIG_SND_USB_AUDIO=m > -CONFIG_SND_USB_USX2Y=m > -CONFIG_SND_USB_US122L=m > CONFIG_SND_USB_HIFACE=m > -CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m > -CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m > -CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m > -CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927=m > -CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m > -CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m > diff --git a/cfg/sound_x86.cfg b/cfg/sound_x86.cfg > new file mode 100644 > index 000000000000..14c9f68b9f19 > --- /dev/null > +++ b/cfg/sound_x86.cfg > @@ -0,0 +1,21 @@ > +# SPDX-License-Identifier: MIT > +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m > +CONFIG_SND_SOC_INTEL_HASWELL=m > +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m > +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m > +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m > +CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m > +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m > +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m > +CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m > +CONFIG_SND_SOC_RT298=m > +CONFIG_SND_SOC_RT5651=m > +CONFIG_SND_SOC_RT5670=m > +CONFIG_SND_USB_USX2Y=m > +CONFIG_SND_USB_US122L=m > +CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m > +CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m > +CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m > +CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927=m > +CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m > +CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m > diff --git a/cfg/sound_x86.scc b/cfg/sound_x86.scc > new file mode 100644 > index 000000000000..eb80edacd820 > --- /dev/null > +++ b/cfg/sound_x86.scc > @@ -0,0 +1,6 @@ > +# SPDX-License-Identifier: MIT > +define KFEATURE_DESCRIPTION "OSS sound support on x86" > +define KFEATURE_COMPATIBILITY board > + > +include sound.scc > +kconf non-hardware sound_x86.cfg > diff --git a/kern-features.rc b/kern-features.rc > index d9ccaf9c5096..b5de26de2ebc 100644 > --- a/kern-features.rc > +++ b/kern-features.rc > @@ -1,6 +1,7 @@ > [kernel-options] > config = cfg/crypto-obsolete-disable.scc > config = cfg/sound.scc > + config = cfg/sound_x86.scc > config = cfg/vmware-guest.scc > config = cfg/fs/btrfs.scc > config = cfg/fs/ext3.scc > -- > 2.34.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16317): https://lists.yoctoproject.org/g/linux-yocto/message/16317 Mute This Topic: https://lists.yoctoproject.org/mt/117525177/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
