From b98ee1af003b2c98ba29836269a1ae1d9ebf56ba Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 28 Jul 2022 22:27:33 -0400 Subject: meta-agl-bsp: Pin i.MX platform kernels to 5.15 LTS The recent bump of meta-freescale with the kirkstone 4.0.2 upgrade brought an upgrade to 5.18 in the linux-fslc kernel, which breaks sllin compilation. Tweak the i.MX6 and i.MX8 machine templates to use the 5.15 linux-fslc-lts kernel, which matches linux-yocto in poky and seems a better choice going forward with kirkstone. Bug-AGL: SPEC-4501 Signed-off-by: Scott Murray Change-Id: Ib75d8c844301c5ac902e18d02ff8ac6176f614c7 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27842 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_cubox-i.inc | 4 ++++ meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc | 4 ++++ meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl-bsp/conf/include/agl_cubox-i.inc index 4fa4815a4..ee5e759e4 100644 --- a/meta-agl-bsp/conf/include/agl_cubox-i.inc +++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc @@ -1,5 +1,9 @@ require agl_imx6-common.inc +# Force use of the community supported LTS kernel instead of the +# default linux-fslc +PREFERRED_PROVIDER_virtual/kernel = "linux-fslc-lts" + # Include devicetrees for SOM 1.5 and Hummingboard 2 hardware KERNEL_DEVICETREE:append = " \ imx6dl-hummingboard-som-v15.dtb \ diff --git a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc index cb13de713..f058ba1a5 100644 --- a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc +++ b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc @@ -1 +1,5 @@ require agl_imx6-common.inc + +# Force use of the community supported LTS kernel instead of the +# default linux-fslc +IMX_DEFAULT_KERNEL:imx6qdlsabreauto = "linux-fslc-lts" diff --git a/meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc b/meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc index 36493dcbf..ac7fc0edc 100644 --- a/meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc +++ b/meta-agl-bsp/conf/include/agl_imx8mq-evk-common.inc @@ -1,8 +1,8 @@ require agl_imx-common.inc # Force use of the community supported LTS kernel instead of the -# default linux-imx -#IMX_DEFAULT_KERNEL:imx8mq-evk = "linux-fslc-imx" +# default linux-fslc +IMX_DEFAULT_KERNEL:imx8mq-evk = "linux-fslc-lts" # For EVKB wifi support #MACHINE_FEATURES:append = " bcm4356" -- cgit 1.2.3-korg