In message: [kernel-cache][yocto-6.18][master][PATCH v2 13/38] nfc-vendor.scc: move Intel configs to nfc-vendor-intel.cfg on 29/01/2026 Mikko Rapeli wrote:
> Their dependency INTEL_MEI is only available on x86. > > Signed-off-by: Mikko Rapeli <[email protected]> > --- > features/nfc/nfc-vendor-intel.cfg | 4 ++++ > features/nfc/nfc-vendor.cfg | 3 --- > features/nfc/nfc-vendor.scc | 3 +++ > 3 files changed, 7 insertions(+), 3 deletions(-) > create mode 100644 features/nfc/nfc-vendor-intel.cfg > > diff --git a/features/nfc/nfc-vendor-intel.cfg > b/features/nfc/nfc-vendor-intel.cfg > new file mode 100644 > index 000000000000..cbdc7a1495f6 > --- /dev/null > +++ b/features/nfc/nfc-vendor-intel.cfg > @@ -0,0 +1,4 @@ > +# SPDX-License-Identifier: MIT > +CONFIG_NFC_MEI_PHY=m > +CONFIG_NFC_MICROREAD_MEI=m > +CONFIG_NFC_PN544_MEI=m > diff --git a/features/nfc/nfc-vendor.cfg b/features/nfc/nfc-vendor.cfg > index 95cad342979e..3d3714afd7dd 100644 > --- a/features/nfc/nfc-vendor.cfg > +++ b/features/nfc/nfc-vendor.cfg > @@ -1,5 +1,4 @@ > # SPDX-License-Identifier: MIT > -CONFIG_NFC_MEI_PHY=m > CONFIG_NFC_PN533=m > CONFIG_NFC_PN533_I2C=m > CONFIG_NFC_PN533_USB=m > @@ -10,10 +9,8 @@ CONFIG_NFC_MRVL_I2C=m > CONFIG_NFC_MRVL_SPI=m > CONFIG_NFC_MICROREAD=m > CONFIG_NFC_MICROREAD_I2C=m > -CONFIG_NFC_MICROREAD_MEI=m > CONFIG_NFC_PN544=m > CONFIG_NFC_PN544_I2C=m > -CONFIG_NFC_PN544_MEI=m > CONFIG_NFC_ST21NFCA=m > CONFIG_NFC_ST21NFCA_I2C=m > CONFIG_NFC_TRF7970A=m > diff --git a/features/nfc/nfc-vendor.scc b/features/nfc/nfc-vendor.scc > index a9559f7d4843..98a51abe873e 100644 > --- a/features/nfc/nfc-vendor.scc > +++ b/features/nfc/nfc-vendor.scc > @@ -5,3 +5,6 @@ define KFEATURE_COMPATIBILITY board > include nfc-generic.scc > > kconf hardware nfc-vendor.cfg > +if [ "$KARCH" = "x86_64" ] || [ "$KARCH" = "i386" ]; then > + kconf hardware nfc-vendor-intel.cfg > +fi Finally back to this now that the 6.18 kernel is in place in master. Here's what I was saying for these types of things: The split out of the intel config is good, no issues there. But rather than the conditional, there's really only includes from specific locations .. BSPs .. So we don't have to make it conditional to avoid a lot of changes. % git grep nfc-vendor bsp/intel-common/intel-common-drivers.scc:include features/nfc/nfc-vendor.scc features/nfc/nfc-vendor.scc:kconf hardware nfc-vendor.cfg kern-features.rc: config = features/nfc/nfc-vendor.scc Rather than do the conditional, it's just easier to update intel-common-drivers.scc to include features/nfc/nfc-vendor.scc and nfc-vendor-intel.scc (which doesn't exist yet, but could easily be created to allow includes versus kconf calls). What I didn't articulate well before, is if our conditional is for multiple architectures, or it is in a common file (like the standard kernel type), then it make sense. But if a feature is only included from a leaf node (a BSP), then we can just get the leaf node to include everything it needs explicitly. I can make those changes myself, since I've taken a long time to get to this. Just let me know. I'll check through the rest of the series shortly and see if there are any more than match the pattern. Bruce > -- > 2.34.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16316): https://lists.yoctoproject.org/g/linux-yocto/message/16316 Mute This Topic: https://lists.yoctoproject.org/mt/117525158/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
