From dbe3561584cd937b3d764348827c5ca8c8cc1d93 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 25 Jul 2022 16:29:13 -0500 Subject: linux-imx: Upgrade to 5.15.32 For i.MX 6 & 7, replace imx-nxp-bsp/defconfig from kernel source arch/arm/configs/imx_v7_defconfig: ``` dd64df27cab6 LF-5825 ARM: config: add tun device support ``` For i.MX 8, replace mx8-nxp-bsp/defconfig from kernel source arch/arm64/configs/imx_v8_defconfig: ``` 3ff6d5992aba LF-5547 .config: imx_v8_defconfig updated c15b5abd7494 LF-5834-2 arm64: configs: imx_v8_defconfig: build module for rpmsg iio pedometer 335562271c7d MLK-25832-4: arch: arm64: configs: Add HDMI RX to imx_v8_defconfig 313dda7d889d LF-5346-2 arm64: imx_v8_defconfig: build FXLS8962AF as module ``` Signed-off-by: Tom Hochstein (cherry picked from commit a9c993ea72351ecaf8f894db7f869835d325b8bf) --- recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig | 1 + recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig | 10 ++++++++++ recipes-kernel/linux/linux-imx_5.15.bb | 12 ++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig b/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig index f4697de8..582625f2 100644 --- a/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig +++ b/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig @@ -147,6 +147,7 @@ CONFIG_BLK_DEV_MD=m CONFIG_BLK_DEV_DM=m CONFIG_DM_CRYPT=m CONFIG_NETDEVICES=y +CONFIG_TUN=y # CONFIG_NET_VENDOR_BROADCOM is not set CONFIG_CS89x0_PLATFORM=y # CONFIG_NET_VENDOR_FARADAY is not set diff --git a/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig index c00288d1..74dc82cb 100644 --- a/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig +++ b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig @@ -843,6 +843,8 @@ CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_HANTRO=m CONFIG_VIDEO_IMX_CAPTURE=y CONFIG_IMX8_MEDIA_DEVICE=m +CONFIG_MHDP_HDMIRX=y +CONFIG_MHDP_HDMIRX_CEC=y CONFIG_FSL_DPAA2=y CONFIG_FSL_PPFE=y CONFIG_FSL_PPFE_UTIL_DISABLED=y @@ -893,6 +895,7 @@ CONFIG_EXTCON_PTN5150=m CONFIG_EXTCON_USB_GPIO=y CONFIG_EXTCON_USBC_CROS_EC=y CONFIG_IIO=y +CONFIG_FXLS8962AF_I2C=m CONFIG_IMX8QXP_ADC=y CONFIG_MAX9611=m CONFIG_QCOM_SPMI_VADC=m @@ -901,6 +904,7 @@ CONFIG_IIO_CROS_EC_SENSORS_CORE=m CONFIG_IIO_CROS_EC_SENSORS=m CONFIG_FXAS21002C=y CONFIG_FXOS8700_I2C=y +CONFIG_RPMSG_IIO_PEDOMETER=m CONFIG_IIO_ST_LSM6DSX=y CONFIG_IIO_CROS_EC_LIGHT_PROX=m CONFIG_SENSORS_ISL29018=y @@ -1038,3 +1042,9 @@ CONFIG_CORESIGHT_SOURCE_ETM4X=y CONFIG_MEMTEST=y CONFIG_TLS=y CONFIG_TLS_DEVICE=y + +# enable Trusted Keys based on CAAM +CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS_TPM=n +CONFIG_TRUSTED_KEYS_TEE=n +CONFIG_TRUSTED_KEYS_CAAM=y diff --git a/recipes-kernel/linux/linux-imx_5.15.bb b/recipes-kernel/linux/linux-imx_5.15.bb index 751e4c9f..8bd3065c 100644 --- a/recipes-kernel/linux/linux-imx_5.15.bb +++ b/recipes-kernel/linux/linux-imx_5.15.bb @@ -20,19 +20,19 @@ DEPENDS += "lzop-native bc-native" # UPGRADE NOTE: # The linux-imx kernel build uses a defconfig maintained in the layer. That # defconfig is a copy of a defconfig maintained by NXP in the source. -# | defconfig in layer | copied from NXP kernel source | -# | linux-imx/imx-nxp-bsp/defconfig | arch/arm/configs/imx_v7_defconfig | -# | linux-imx/mx8-nxp-bsp/defconfig | arch/arm64/configs/imx_v8_defconfig | +# | SOURCE | LAYER | +# | arch/arm/configs/imx_v7_defconfig | linux-imx/imx-nxp-bsp/defconfig | +# | arch/arm64/configs/imx_v8_defconfig | linux-imx/mx8-nxp-bsp/defconfig | SRCBRANCH = "lf-5.15.y" -LOCALVERSION = "-5.15.5_1.0.0" -SRCREV = "c1084c2773fc1005ed140db625399d5334d94a28" +LOCALVERSION = "-5.15.32_2.0.0" +SRCREV = "fa6c3168595c02bd9d5366fcc28c9e7304947a3d" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.15.5" +LINUX_VERSION = "5.15.32" DEFAULT_PREFERENCE = "1" -- cgit v1.2.3-54-g00ecf