I had a minor merge conflict with this change:
-
commit 8de3d1d2825a5d6fb30279acb583f9778c1da164
Author: Meng Li
Date: Thu Feb 22 22:44:26 2024 +0800
ti-am62: enable optee related kernel configs
Add optee feature and enable it in ti-am62 BSP.
Signed-off-by: Meng Li
Signed-off-by: Bruce Ashfield
-
but of course it was easy to resolve and this is now
merged.
Bruce
In message: [v2][linux-yocto][yocto-kernel-cache][yocto-6.1][PATCH] ti-am62:
add TSN feature related kernel configs
on 27/03/2024 Xulin Sun wrote:
> Add TSN feature related kernel configs, and drop the duplicated
> kernel config CONFIG_NET_SCH_TAPRIO with tsn.cfg.
>
> Signed-off-by: Xulin Sun
> ---
> bsp/ti-am62/ti-am62.cfg | 1 -
> bsp/ti-am62/ti-am62.scc | 1 +
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bsp/ti-am62/ti-am62.cfg b/bsp/ti-am62/ti-am62.cfg
> index fdef5c2b..2dab2c45 100755
> --- a/bsp/ti-am62/ti-am62.cfg
> +++ b/bsp/ti-am62/ti-am62.cfg
> @@ -251,7 +251,6 @@ CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y
> CONFIG_NET_SWITCHDEV=y
> CONFIG_TI_K3_AM65_CPTS=y
> CONFIG_TI_AM65_CPSW_TAS=y
> -CONFIG_NET_SCH_TAPRIO=y
> CONFIG_BRIDGE_VLAN_FILTERING=y
>
> #
> diff --git a/bsp/ti-am62/ti-am62.scc b/bsp/ti-am62/ti-am62.scc
> index 9a0dda7f..d8d41953 100644
> --- a/bsp/ti-am62/ti-am62.scc
> +++ b/bsp/ti-am62/ti-am62.scc
> @@ -4,5 +4,6 @@ include cfg/fs/flash_fs.cfg
> include features/hugetlb/hugetlb.scc
> # Enable the ability to run 32 bit apps
> include arch/arm/32bit-compat.scc
> +include features/tsn/tsn.scc
>
> kconf hardware ti-am62.cfg
> --
> 2.34.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13751):
https://lists.yoctoproject.org/g/linux-yocto/message/13751
Mute This Topic: https://lists.yoctoproject.org/mt/105173754/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
