summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2022-12-30 09:45:23 -0700
committerTom Hochstein <tom.hochstein@nxp.com>2022-12-30 10:11:18 -0700
commite40a20c1cb045db4b0c83bc7a7cee9654cc80807 (patch)
tree4eba5c1e49abb4c0c33813e3f523c0040133a935
parent03499d2e8db8d476ed0ee6cc323a06b337b6dd80 (diff)
downloadmeta-freescale-e40a20c1cb045db4b0c83bc7a7cee9654cc80807.tar.gz
linux-imx: Upgrade 5.15.52 -> 5.15.71
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-rw-r--r--recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig7
-rw-r--r--recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig8
-rw-r--r--recipes-kernel/linux/linux-imx_5.15.bb6
3 files changed, 13 insertions, 8 deletions
diff --git a/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig b/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig
index 582625f2..be46db23 100644
--- a/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig
@@ -586,3 +586,10 @@ CONFIG_CRYPTO_USER_API_AEAD=m
586# enable KTLS 586# enable KTLS
587CONFIG_TLS=y 587CONFIG_TLS=y
588CONFIG_TLS_DEVICE=y 588CONFIG_TLS_DEVICE=y
589
590#enable trust based hardware key
591CONFIG_TRUSTED_KEYS=m
592CONFIG_TRUSTED_KEYS_TPM=n
593CONFIG_TRUSTED_KEYS_TEE=n
594CONFIG_TRUSTED_KEYS_CAAM=n
595CONFIG_TRUSTED_KEYS_DCP=y
diff --git a/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig
index 1ef259ee..97dc633d 100644
--- a/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig
@@ -558,6 +558,7 @@ CONFIG_SDR_PLATFORM_DRIVERS=y
558CONFIG_VIDEO_IMX219=m 558CONFIG_VIDEO_IMX219=m
559CONFIG_VIDEO_OV5640=y 559CONFIG_VIDEO_OV5640=y
560CONFIG_VIDEO_OV5645=m 560CONFIG_VIDEO_OV5645=m
561CONFIG_VIDEO_MT9M114=y
561CONFIG_VIDEO_AP1302=y 562CONFIG_VIDEO_AP1302=y
562CONFIG_IMX_DPU_CORE=y 563CONFIG_IMX_DPU_CORE=y
563CONFIG_IMX_LCDIF_CORE=y 564CONFIG_IMX_LCDIF_CORE=y
@@ -572,6 +573,7 @@ CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
572CONFIG_DRM_PANEL_LVDS=m 573CONFIG_DRM_PANEL_LVDS=m
573CONFIG_DRM_PANEL_SIMPLE=y 574CONFIG_DRM_PANEL_SIMPLE=y
574CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m 575CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
576CONFIG_DRM_PANEL_ONTAT_KD50G21_40NT_A1=y
575CONFIG_DRM_PANEL_RAYDIUM_RM67191=y 577CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
576CONFIG_DRM_PANEL_RAYDIUM_RM68200=y 578CONFIG_DRM_PANEL_RAYDIUM_RM68200=y
577CONFIG_DRM_PANEL_ROCKTECK_HIMAX8394F=y 579CONFIG_DRM_PANEL_ROCKTECK_HIMAX8394F=y
@@ -611,6 +613,7 @@ CONFIG_DRM_IMX8QM_LDB=y
611CONFIG_DRM_IMX8QXP_LDB=y 613CONFIG_DRM_IMX8QXP_LDB=y
612CONFIG_DRM_IMX8MP_LDB=y 614CONFIG_DRM_IMX8MP_LDB=y
613CONFIG_DRM_IMX93_LDB=y 615CONFIG_DRM_IMX93_LDB=y
616CONFIG_DRM_IMX93_PARALLEL_DISPLAY_FORMAT=y
614CONFIG_DRM_IMX_DW_MIPI_DSI=y 617CONFIG_DRM_IMX_DW_MIPI_DSI=y
615CONFIG_DRM_IMX_HDMI=y 618CONFIG_DRM_IMX_HDMI=y
616CONFIG_DRM_IMX_SEC_DSIM=y 619CONFIG_DRM_IMX_SEC_DSIM=y
@@ -903,8 +906,6 @@ CONFIG_FSL_MC_DPIO=y
903CONFIG_FSL_RCPM=y 906CONFIG_FSL_RCPM=y
904CONFIG_FSL_QIXIS=y 907CONFIG_FSL_QIXIS=y
905CONFIG_SOC_TI=y 908CONFIG_SOC_TI=y
906CONFIG_ARM_IMX_BUS_DEVFREQ=m
907CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
908CONFIG_EXTCON_PTN5150=m 909CONFIG_EXTCON_PTN5150=m
909CONFIG_EXTCON_USB_GPIO=y 910CONFIG_EXTCON_USB_GPIO=y
910CONFIG_EXTCON_USBC_CROS_EC=y 911CONFIG_EXTCON_USBC_CROS_EC=y
@@ -963,9 +964,6 @@ CONFIG_TEE=y
963CONFIG_OPTEE=y 964CONFIG_OPTEE=y
964CONFIG_MUX_MMIO=y 965CONFIG_MUX_MMIO=y
965CONFIG_SLIM_QCOM_CTRL=m 966CONFIG_SLIM_QCOM_CTRL=m
966CONFIG_INTERCONNECT=y
967CONFIG_INTERCONNECT_IMX=m
968CONFIG_INTERCONNECT_IMX8MQ=m
969CONFIG_MXC_SIM=y 967CONFIG_MXC_SIM=y
970CONFIG_MXC_EMVSIM=y 968CONFIG_MXC_EMVSIM=y
971CONFIG_EXT2_FS=y 969CONFIG_EXT2_FS=y
diff --git a/recipes-kernel/linux/linux-imx_5.15.bb b/recipes-kernel/linux/linux-imx_5.15.bb
index 17c83032..b3c7a7fc 100644
--- a/recipes-kernel/linux/linux-imx_5.15.bb
+++ b/recipes-kernel/linux/linux-imx_5.15.bb
@@ -24,15 +24,15 @@ DEPENDS += "lzop-native bc-native"
24# | arch/arm/configs/imx_v7_defconfig | linux-imx/imx-nxp-bsp/defconfig | 24# | arch/arm/configs/imx_v7_defconfig | linux-imx/imx-nxp-bsp/defconfig |
25# | arch/arm64/configs/imx_v8_defconfig | linux-imx/mx8-nxp-bsp/defconfig | 25# | arch/arm64/configs/imx_v8_defconfig | linux-imx/mx8-nxp-bsp/defconfig |
26SRCBRANCH = "lf-5.15.y" 26SRCBRANCH = "lf-5.15.y"
27LOCALVERSION = "-5.15.52-2.1.0" 27LOCALVERSION = "-5.15.71-2.2.0"
28SRCREV = "36363d8623ba60858e2632b7d2b70dae932c9a8b" 28SRCREV = "3313732e9984cb8a6b10a9085c7e18d58e770d56"
29 29
30# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 30# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
31# required by kernel-yocto.bbclass. 31# required by kernel-yocto.bbclass.
32# 32#
33# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 33# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
34# should be updated once patchlevel is merged. 34# should be updated once patchlevel is merged.
35LINUX_VERSION = "5.15.52" 35LINUX_VERSION = "5.15.71"
36 36
37DEFAULT_PREFERENCE = "1" 37DEFAULT_PREFERENCE = "1"
38 38