From 1038192b11bd641feeff8cda7362818ad5bb9803 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Tue, 1 Jul 2025 17:07:24 +0200 Subject: [PATCH] linux-dey: tsn: fix tsn kernel support fix missing option to include the required kernel options for tsn support. That support was added in commit 37f5db42ac6d for kernel 6.1, but it was missed for kernel 6.6. Add the support to include the required fragment, regardless the kernel version. While on it, update the tsn config to match kernel 6.6. Signed-off-by: Isaac Hermida --- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 1 + .../recipes-kernel/linux/linux-dey/tsn_conf.cfg | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index fdcbb9e77..3ad4a7016 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -13,6 +13,7 @@ SRC_URI = " \ ${LINUX_GIT_URI};branch=${SRCBRANCH} \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'file://docker_conf.cfg', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'file://tsn_conf.cfg', '', d)} \ ${@oe.utils.vartrue('TRUSTFENCE_FILE_BASED_ENCRYPT', 'file://fscrypt.cfg', '', d)} \ " S = "${WORKDIR}/git" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey/tsn_conf.cfg b/meta-digi-arm/recipes-kernel/linux/linux-dey/tsn_conf.cfg index cdc21fd88..dc1c2cb9f 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey/tsn_conf.cfg +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey/tsn_conf.cfg @@ -10,18 +10,24 @@ . consult the product documentation. . .......................................................................... +CONFIG_TSN=y CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_CBS=m +CONFIG_NET_SCH_CBS=y CONFIG_NET_SCH_ETF=m -CONFIG_NET_SCH_TAPRIO=m -CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_TAPRIO=y +CONFIG_NET_SCH_MQPRIO=y CONFIG_NET_SCH_INGRESS=m CONFIG_NET_CLS_BASIC=m CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_FLOWER=m CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_GATE=m CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_GATE=m +CONFIG_FSL_ENETC=y CONFIG_FSL_ENETC_QOS=y +CONFIG_IFB=m