summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>2020-08-18 22:09:23 +0000
committerOtavio Salvador <otavio@ossystems.com.br>2020-09-23 23:42:37 -0300
commit5f363e4aa36779d8d59dda89e518ed6adae08e10 (patch)
tree032954280047419f8b173509b3077e8986a08df9 /recipes-kernel
parentb98b3c88b7b10e957ce19fc9242a85a234acdd2e (diff)
downloadmeta-freescale-5f363e4aa36779d8d59dda89e518ed6adae08e10.tar.gz
linux-fslc-imx: upgrade to rel_imx_5.4.24_2.1.0 from NXP
NXP released a new BSP, which included a new kernel branch imx_5.4.24_2.1.0. This branch was picked up into linux-fslc repository and received an update up to v5.4.67 tag from stable korg. New release from NXP requires the new kernel branch to be used, so switch the kernel recipe to a new branch as well. Update defconfig file to align with imx_v8_defconfig provided by NXP and used as a base kernel configuration file for i.MX8 family, and imx_v7_defconfig which is used for i.MX6/7 families. Tracking information has been updated to reflect the state of the new branch; all NXP-specific patches are tracked to be present in the base NXP delivery and therefore were removed from the tracking list; all critical patches are also verified to be present in the updated kernel branch; specific cherry-picks are moved to new branch as well. Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-fslc-imx/imx/defconfig29
-rw-r--r--recipes-kernel/linux/linux-fslc-imx/mx8/defconfig66
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_5.4.bb36
3 files changed, 104 insertions, 27 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/imx/defconfig
index 622e5430..30792d23 100644
--- a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/imx/defconfig
@@ -1,5 +1,6 @@
1CONFIG_KERNEL_LZO=y 1CONFIG_KERNEL_LZO=y
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y
3CONFIG_NO_HZ=y 4CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y 5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_PREEMPT=y 6CONFIG_PREEMPT=y
@@ -7,6 +8,12 @@ CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 8CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=18 9CONFIG_LOG_BUF_SHIFT=18
9CONFIG_CGROUPS=y 10CONFIG_CGROUPS=y
11CONFIG_MEMCG=y
12CONFIG_CGROUP_PIDS=y
13CONFIG_CGROUP_FREEZER=y
14CONFIG_CGROUP_DEVICE=y
15CONFIG_NAMESPACES=y
16CONFIG_USER_NS=y
10CONFIG_RELAY=y 17CONFIG_RELAY=y
11CONFIG_BLK_DEV_INITRD=y 18CONFIG_BLK_DEV_INITRD=y
12CONFIG_EXPERT=y 19CONFIG_EXPERT=y
@@ -57,6 +64,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57# CONFIG_BLK_DEV_BSG is not set 64# CONFIG_BLK_DEV_BSG is not set
58CONFIG_BINFMT_MISC=m 65CONFIG_BINFMT_MISC=m
59CONFIG_CMA=y 66CONFIG_CMA=y
67CONFIG_SECCOMP=y
60CONFIG_NET=y 68CONFIG_NET=y
61CONFIG_PACKET=y 69CONFIG_PACKET=y
62CONFIG_UNIX=y 70CONFIG_UNIX=y
@@ -120,6 +128,7 @@ CONFIG_MTD_SPI_NOR=y
120CONFIG_MTD_UBI=y 128CONFIG_MTD_UBI=y
121CONFIG_MTD_UBI_FASTMAP=y 129CONFIG_MTD_UBI_FASTMAP=y
122CONFIG_MTD_UBI_BLOCK=y 130CONFIG_MTD_UBI_BLOCK=y
131CONFIG_OF_OVERLAY=y
123CONFIG_BLK_DEV_LOOP=y 132CONFIG_BLK_DEV_LOOP=y
124CONFIG_BLK_DEV_RAM=y 133CONFIG_BLK_DEV_RAM=y
125CONFIG_BLK_DEV_RAM_SIZE=65536 134CONFIG_BLK_DEV_RAM_SIZE=65536
@@ -142,7 +151,7 @@ CONFIG_NETDEVICES=y
142CONFIG_CS89x0=y 151CONFIG_CS89x0=y
143CONFIG_CS89x0_PLATFORM=y 152CONFIG_CS89x0_PLATFORM=y
144# CONFIG_NET_VENDOR_FARADAY is not set 153# CONFIG_NET_VENDOR_FARADAY is not set
145# CONFIG_NET_VENDOR_INTEL is not set 154CONFIG_E1000E=y
146# CONFIG_NET_VENDOR_MARVELL is not set 155# CONFIG_NET_VENDOR_MARVELL is not set
147# CONFIG_NET_VENDOR_MICREL is not set 156# CONFIG_NET_VENDOR_MICREL is not set
148# CONFIG_NET_VENDOR_MICROCHIP is not set 157# CONFIG_NET_VENDOR_MICROCHIP is not set
@@ -165,6 +174,7 @@ CONFIG_USB_NET_SMSC95XX=y
165CONFIG_USB_NET_MCS7830=y 174CONFIG_USB_NET_MCS7830=y
166CONFIG_BRCMFMAC=m 175CONFIG_BRCMFMAC=m
167CONFIG_HOSTAP=y 176CONFIG_HOSTAP=y
177CONFIG_MXMWIFIEX=m
168CONFIG_WL12XX=m 178CONFIG_WL12XX=m
169CONFIG_WL18XX=m 179CONFIG_WL18XX=m
170CONFIG_WLCORE_SDIO=m 180CONFIG_WLCORE_SDIO=m
@@ -446,6 +456,8 @@ CONFIG_STAGING_MEDIA=y
446CONFIG_COMMON_CLK_PWM=y 456CONFIG_COMMON_CLK_PWM=y
447CONFIG_MAILBOX=y 457CONFIG_MAILBOX=y
448CONFIG_IMX_MBOX=y 458CONFIG_IMX_MBOX=y
459CONFIG_REMOTEPROC=y
460CONFIG_IMX_REMOTEPROC=y
449CONFIG_EXTCON_USB_GPIO=y 461CONFIG_EXTCON_USB_GPIO=y
450CONFIG_IIO=y 462CONFIG_IIO=y
451CONFIG_IMX7D_ADC=y 463CONFIG_IMX7D_ADC=y
@@ -483,6 +495,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
483# CONFIG_PRINT_QUOTA_WARNING is not set 495# CONFIG_PRINT_QUOTA_WARNING is not set
484CONFIG_AUTOFS4_FS=y 496CONFIG_AUTOFS4_FS=y
485CONFIG_FUSE_FS=y 497CONFIG_FUSE_FS=y
498CONFIG_OVERLAY_FS=y
486CONFIG_ISO9660_FS=m 499CONFIG_ISO9660_FS=m
487CONFIG_JOLIET=y 500CONFIG_JOLIET=y
488CONFIG_ZISOFS=y 501CONFIG_ZISOFS=y
@@ -535,6 +548,20 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m
535CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y 548CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
536CONFIG_CRYPTO_DEV_SAHARA=y 549CONFIG_CRYPTO_DEV_SAHARA=y
537CONFIG_CRYPTO_DEV_MXS_DCP=y 550CONFIG_CRYPTO_DEV_MXS_DCP=y
551CONFIG_CRYPTO_PCBC=m
552CONFIG_CRYPTO_XCBC=m
553CONFIG_CRYPTO_VMAC=m
554CONFIG_CRYPTO_SM3=m
555CONFIG_CRYPTO_STREEBOG=m
556CONFIG_CRYPTO_ANUBIS=m
557CONFIG_CRYPTO_FCRYPT=m
558CONFIG_CRYPTO_KHAZAD=m
559CONFIG_CRYPTO_SALSA20=m
560CONFIG_CRYPTO_SEED=m
561CONFIG_CRYPTO_SM4=m
562CONFIG_CRYPTO_TEA=m
563CONFIG_CRYPTO_ANSI_CPRNG=m
564CONFIG_CRYPTO_SHA1=m
538CONFIG_CRC_CCITT=m 565CONFIG_CRC_CCITT=m
539CONFIG_CRC_T10DIF=y 566CONFIG_CRC_T10DIF=y
540CONFIG_CRC7=m 567CONFIG_CRC7=m
diff --git a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig
index 469ee0ef..cf8df95f 100644
--- a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig
@@ -66,6 +66,7 @@ CONFIG_EFI_CAPSULE_LOADER=y
66CONFIG_IMX_DSP=y 66CONFIG_IMX_DSP=y
67CONFIG_IMX_SCU=y 67CONFIG_IMX_SCU=y
68CONFIG_IMX_SCU_PD=y 68CONFIG_IMX_SCU_PD=y
69CONFIG_IMX_SECO_MU=y
69CONFIG_ACPI=y 70CONFIG_ACPI=y
70CONFIG_ACPI_APEI=y 71CONFIG_ACPI_APEI=y
71CONFIG_ACPI_APEI_GHES=y 72CONFIG_ACPI_APEI_GHES=y
@@ -127,9 +128,17 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
127CONFIG_VLAN_8021Q_GVRP=y 128CONFIG_VLAN_8021Q_GVRP=y
128CONFIG_VLAN_8021Q_MVRP=y 129CONFIG_VLAN_8021Q_MVRP=y
129CONFIG_LLC2=y 130CONFIG_LLC2=y
131CONFIG_NET_SCHED=y
132CONFIG_NET_SCH_MULTIQ=y
133CONFIG_NET_SCH_CBS=y
134CONFIG_NET_SCH_TAPRIO=y
135CONFIG_NET_SCH_MQPRIO=y
136CONFIG_NET_CLS_BASIC=y
137CONFIG_NET_CLS_TCINDEX=y
130CONFIG_TSN=y 138CONFIG_TSN=y
131CONFIG_NET_SWITCHDEV=y 139CONFIG_NET_SWITCHDEV=y
132CONFIG_BPF_JIT=y 140CONFIG_BPF_JIT=y
141CONFIG_NET_PKTGEN=y
133CONFIG_CAN=m 142CONFIG_CAN=m
134CONFIG_CAN_FLEXCAN=m 143CONFIG_CAN_FLEXCAN=m
135CONFIG_BT=y 144CONFIG_BT=y
@@ -272,7 +281,7 @@ CONFIG_MSCC_OCELOT_SWITCH=y
272CONFIG_QCOM_EMAC=m 281CONFIG_QCOM_EMAC=m
273CONFIG_SMC91X=y 282CONFIG_SMC91X=y
274CONFIG_SMSC911X=y 283CONFIG_SMSC911X=y
275CONFIG_STMMAC_ETH=m 284CONFIG_STMMAC_ETH=y
276CONFIG_MDIO_BITBANG=y 285CONFIG_MDIO_BITBANG=y
277CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y 286CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
278CONFIG_AQUANTIA_PHY=y 287CONFIG_AQUANTIA_PHY=y
@@ -300,9 +309,10 @@ CONFIG_USB_NET_MCS7830=m
300CONFIG_BRCMFMAC=m 309CONFIG_BRCMFMAC=m
301CONFIG_BRCMFMAC_PCIE=y 310CONFIG_BRCMFMAC_PCIE=y
302CONFIG_HOSTAP=y 311CONFIG_HOSTAP=y
312CONFIG_MXMWIFIEX=m
303CONFIG_WL18XX=m 313CONFIG_WL18XX=m
304CONFIG_WLCORE_SDIO=m 314CONFIG_WLCORE_SDIO=m
305CONFIG_IVSHMEM_NET=m 315CONFIG_IVSHMEM_NET=y
306CONFIG_INPUT_EVDEV=y 316CONFIG_INPUT_EVDEV=y
307CONFIG_KEYBOARD_ADC=m 317CONFIG_KEYBOARD_ADC=m
308CONFIG_KEYBOARD_GPIO=y 318CONFIG_KEYBOARD_GPIO=y
@@ -351,6 +361,7 @@ CONFIG_I2C_IMX_LPI2C=y
351CONFIG_I2C_RK3X=y 361CONFIG_I2C_RK3X=y
352CONFIG_I2C_RPBUS=y 362CONFIG_I2C_RPBUS=y
353CONFIG_I2C_CROS_EC_TUNNEL=y 363CONFIG_I2C_CROS_EC_TUNNEL=y
364CONFIG_XEN_I2C_BACKEND=y
354CONFIG_I2C_SLAVE=y 365CONFIG_I2C_SLAVE=y
355CONFIG_SPI=y 366CONFIG_SPI=y
356CONFIG_SPI_FSL_LPSPI=y 367CONFIG_SPI_FSL_LPSPI=y
@@ -369,9 +380,11 @@ CONFIG_PINCTRL_SINGLE=y
369CONFIG_PINCTRL_MAX77620=y 380CONFIG_PINCTRL_MAX77620=y
370CONFIG_PINCTRL_IMX8MM=y 381CONFIG_PINCTRL_IMX8MM=y
371CONFIG_PINCTRL_IMX8MN=y 382CONFIG_PINCTRL_IMX8MN=y
383CONFIG_PINCTRL_IMX8MP=y
372CONFIG_PINCTRL_IMX8MQ=y 384CONFIG_PINCTRL_IMX8MQ=y
373CONFIG_PINCTRL_IMX8QM=y 385CONFIG_PINCTRL_IMX8QM=y
374CONFIG_PINCTRL_IMX8QXP=y 386CONFIG_PINCTRL_IMX8QXP=y
387CONFIG_PINCTRL_IMX8DXL=y
375CONFIG_PINCTRL_S32V234=y 388CONFIG_PINCTRL_S32V234=y
376CONFIG_GPIOLIB=y 389CONFIG_GPIOLIB=y
377CONFIG_GPIO_SYSFS=y 390CONFIG_GPIO_SYSFS=y
@@ -411,8 +424,10 @@ CONFIG_ARM_SBSA_WATCHDOG=y
411CONFIG_DW_WATCHDOG=y 424CONFIG_DW_WATCHDOG=y
412CONFIG_IMX2_WDT=y 425CONFIG_IMX2_WDT=y
413CONFIG_IMX_SC_WDT=y 426CONFIG_IMX_SC_WDT=y
427CONFIG_XEN_WDT=y
414CONFIG_MFD_BD9571MWV=y 428CONFIG_MFD_BD9571MWV=y
415CONFIG_MFD_AXP20X_I2C=y 429CONFIG_MFD_AXP20X_I2C=y
430CONFIG_MFD_IMX_AUDIOMIX=y
416CONFIG_MFD_HI6421_PMIC=y 431CONFIG_MFD_HI6421_PMIC=y
417CONFIG_MFD_MAX77620=y 432CONFIG_MFD_MAX77620=y
418CONFIG_MFD_RK808=y 433CONFIG_MFD_RK808=y
@@ -458,6 +473,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
458CONFIG_VIDEO_OV5640=y 473CONFIG_VIDEO_OV5640=y
459CONFIG_IMX_DPU_CORE=y 474CONFIG_IMX_DPU_CORE=y
460CONFIG_IMX_LCDIF_CORE=y 475CONFIG_IMX_LCDIF_CORE=y
476CONFIG_IMX_LCDIFV3_CORE=y
461CONFIG_DRM=y 477CONFIG_DRM=y
462CONFIG_DRM_I2C_NXP_TDA998X=m 478CONFIG_DRM_I2C_NXP_TDA998X=m
463CONFIG_DRM_MALI_DISPLAY=m 479CONFIG_DRM_MALI_DISPLAY=m
@@ -465,16 +481,24 @@ CONFIG_DRM_NOUVEAU=m
465CONFIG_DRM_RCAR_LVDS=m 481CONFIG_DRM_RCAR_LVDS=m
466CONFIG_DRM_PANEL_SIMPLE=y 482CONFIG_DRM_PANEL_SIMPLE=y
467CONFIG_DRM_PANEL_RAYDIUM_RM67191=y 483CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
484CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
485CONFIG_DRM_FSL_IMX_LVDS_BRIDGE=y
468CONFIG_DRM_SII902X=m 486CONFIG_DRM_SII902X=m
469CONFIG_DRM_I2C_ADV7511=y 487CONFIG_DRM_I2C_ADV7511=y
470CONFIG_DRM_NWL_MIPI_DSI=y 488CONFIG_DRM_NWL_MIPI_DSI=y
471CONFIG_DRM_CDNS_HDMI_CEC=y 489CONFIG_DRM_CDNS_HDMI_CEC=y
472CONFIG_DRM_DW_HDMI_I2S_AUDIO=m 490CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
491CONFIG_DRM_DW_HDMI_GP_AUDIO=y
492CONFIG_DRM_DW_HDMI_CEC=y
473CONFIG_DRM_ITE_IT6263=y 493CONFIG_DRM_ITE_IT6263=y
474CONFIG_DRM_IMX=y 494CONFIG_DRM_IMX=y
495CONFIG_DRM_IMX_LCDIF_MUX_DISPLAY=y
475CONFIG_DRM_IMX_PARALLEL_DISPLAY=y 496CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
476CONFIG_DRM_IMX_TVE=y 497CONFIG_DRM_IMX_TVE=y
477CONFIG_DRM_IMX_LDB=y 498CONFIG_DRM_IMX_LDB=y
499CONFIG_DRM_IMX8QM_LDB=y
500CONFIG_DRM_IMX8QXP_LDB=y
501CONFIG_DRM_IMX8MP_LDB=y
478CONFIG_DRM_IMX_HDMI=y 502CONFIG_DRM_IMX_HDMI=y
479CONFIG_DRM_IMX_SEC_DSIM=y 503CONFIG_DRM_IMX_SEC_DSIM=y
480CONFIG_DRM_IMX_CDNS_MHDP=y 504CONFIG_DRM_IMX_CDNS_MHDP=y
@@ -516,12 +540,14 @@ CONFIG_SND_SOC_IMX_AUDMIX=y
516CONFIG_SND_SOC_IMX_PDM_MIC=y 540CONFIG_SND_SOC_IMX_PDM_MIC=y
517CONFIG_SND_SOC_IMX_DSP=y 541CONFIG_SND_SOC_IMX_DSP=y
518CONFIG_SND_SOC_IMX_CDNHDMI=y 542CONFIG_SND_SOC_IMX_CDNHDMI=y
543CONFIG_SND_SOC_IMX_XCVR=y
519CONFIG_SND_SOC_SOF_TOPLEVEL=y 544CONFIG_SND_SOC_SOF_TOPLEVEL=y
520CONFIG_SND_SOC_SOF_OF=m 545CONFIG_SND_SOC_SOF_OF=m
521CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y 546CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y
522CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y 547CONFIG_SND_SOC_SOF_IMX8_SUPPORT=m
523CONFIG_SND_SOC_SOF_IMX8=m 548CONFIG_SND_SOC_SOF_IMX8M_SUPPORT=m
524CONFIG_SND_SOC_AK4613=m 549CONFIG_SND_SOC_AK4613=m
550CONFIG_SND_SOC_BT_SCO=y
525CONFIG_SND_SOC_DMIC=m 551CONFIG_SND_SOC_DMIC=m
526CONFIG_SND_SOC_ES7134=m 552CONFIG_SND_SOC_ES7134=m
527CONFIG_SND_SOC_ES7241=m 553CONFIG_SND_SOC_ES7241=m
@@ -554,6 +580,11 @@ CONFIG_USB_CHIPIDEA=y
554CONFIG_USB_CHIPIDEA_UDC=y 580CONFIG_USB_CHIPIDEA_UDC=y
555CONFIG_USB_CHIPIDEA_HOST=y 581CONFIG_USB_CHIPIDEA_HOST=y
556CONFIG_USB_ISP1760=y 582CONFIG_USB_ISP1760=y
583CONFIG_USB_SERIAL=y
584CONFIG_USB_SERIAL_CONSOLE=y
585CONFIG_USB_SERIAL_GENERIC=y
586CONFIG_USB_SERIAL_SIMPLE=y
587CONFIG_USB_SERIAL_FTDI_SIO=y
557CONFIG_USB_TEST=m 588CONFIG_USB_TEST=m
558CONFIG_USB_EHSET_TEST_FIXTURE=m 589CONFIG_USB_EHSET_TEST_FIXTURE=m
559CONFIG_USB_HSIC_USB3503=y 590CONFIG_USB_HSIC_USB3503=y
@@ -619,6 +650,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
619CONFIG_LEDS_TRIGGER_PANIC=y 650CONFIG_LEDS_TRIGGER_PANIC=y
620CONFIG_EDAC=y 651CONFIG_EDAC=y
621CONFIG_EDAC_GHES=y 652CONFIG_EDAC_GHES=y
653CONFIG_EDAC_SYNOPSYS=y
622CONFIG_RTC_CLASS=y 654CONFIG_RTC_CLASS=y
623CONFIG_RTC_DRV_DS1307=y 655CONFIG_RTC_DRV_DS1307=y
624CONFIG_RTC_DRV_MAX77686=y 656CONFIG_RTC_DRV_MAX77686=y
@@ -646,6 +678,7 @@ CONFIG_QCOM_HIDMA=y
646CONFIG_DMATEST=y 678CONFIG_DMATEST=y
647CONFIG_UIO=y 679CONFIG_UIO=y
648CONFIG_UIO_PCI_GENERIC=y 680CONFIG_UIO_PCI_GENERIC=y
681CONFIG_UIO_IVSHMEM=y
649CONFIG_VFIO=y 682CONFIG_VFIO=y
650CONFIG_VFIO_PCI=y 683CONFIG_VFIO_PCI=y
651CONFIG_VFIO_FSL_MC=y 684CONFIG_VFIO_FSL_MC=y
@@ -680,6 +713,7 @@ CONFIG_COMMON_CLK_XGENE=y
680CONFIG_COMMON_CLK_PWM=y 713CONFIG_COMMON_CLK_PWM=y
681CONFIG_CLK_IMX8MM=y 714CONFIG_CLK_IMX8MM=y
682CONFIG_CLK_IMX8MN=y 715CONFIG_CLK_IMX8MN=y
716CONFIG_CLK_IMX8MP=y
683CONFIG_CLK_IMX8MQ=y 717CONFIG_CLK_IMX8MQ=y
684CONFIG_CLK_IMX8QXP=y 718CONFIG_CLK_IMX8QXP=y
685CONFIG_HWSPINLOCK=y 719CONFIG_HWSPINLOCK=y
@@ -689,11 +723,13 @@ CONFIG_PLATFORM_MHU=y
689CONFIG_ARM_SMMU=y 723CONFIG_ARM_SMMU=y
690CONFIG_ARM_SMMU_V3=y 724CONFIG_ARM_SMMU_V3=y
691CONFIG_REMOTEPROC=y 725CONFIG_REMOTEPROC=y
726CONFIG_IMX_REMOTEPROC=y
692CONFIG_RPMSG_QCOM_GLINK_RPM=y 727CONFIG_RPMSG_QCOM_GLINK_RPM=y
693CONFIG_SOC_BRCMSTB=y 728CONFIG_SOC_BRCMSTB=y
694CONFIG_FSL_MC_DPIO=y 729CONFIG_FSL_MC_DPIO=y
695CONFIG_FSL_QIXIS=y 730CONFIG_FSL_QIXIS=y
696CONFIG_IMX_SCU_SOC=y 731CONFIG_IMX_SCU_SOC=y
732CONFIG_SECVIO_SC=y
697CONFIG_SOC_TI=y 733CONFIG_SOC_TI=y
698CONFIG_EXTCON_USB_GPIO=y 734CONFIG_EXTCON_USB_GPIO=y
699CONFIG_EXTCON_USBC_CROS_EC=y 735CONFIG_EXTCON_USBC_CROS_EC=y
@@ -707,10 +743,14 @@ CONFIG_PWM=y
707CONFIG_PWM_CROS_EC=m 743CONFIG_PWM_CROS_EC=m
708CONFIG_PWM_IMX27=y 744CONFIG_PWM_IMX27=y
709CONFIG_PHY_XGENE=y 745CONFIG_PHY_XGENE=y
746CONFIG_PHY_MIXEL_LVDS=y
747CONFIG_PHY_MIXEL_LVDS_COMBO=y
748CONFIG_PHY_FSL_IMX8MP_LVDS=y
710CONFIG_PHY_MIXEL_MIPI_DPHY=y 749CONFIG_PHY_MIXEL_MIPI_DPHY=y
750CONFIG_PHY_SAMSUNG_HDMI_PHY=y
711CONFIG_PHY_QCOM_USB_HS=y 751CONFIG_PHY_QCOM_USB_HS=y
712CONFIG_PHY_SAMSUNG_USB2=y 752CONFIG_PHY_SAMSUNG_USB2=y
713CONFIG_FSL_IMX8_DDR_PMU=m 753CONFIG_FSL_IMX8_DDR_PMU=y
714CONFIG_HISI_PMU=y 754CONFIG_HISI_PMU=y
715CONFIG_NVMEM_IMX_OCOTP=y 755CONFIG_NVMEM_IMX_OCOTP=y
716CONFIG_NVMEM_IMX_OCOTP_SCU=y 756CONFIG_NVMEM_IMX_OCOTP_SCU=y
@@ -784,6 +824,19 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
784CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m 824CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m
785CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y 825CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
786CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y 826CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y
827CONFIG_CRYPTO_PCBC=m
828CONFIG_CRYPTO_XCBC=m
829CONFIG_CRYPTO_VMAC=m
830CONFIG_CRYPTO_SM3=m
831CONFIG_CRYPTO_STREEBOG=m
832CONFIG_CRYPTO_ANUBIS=m
833CONFIG_CRYPTO_DES=y
834CONFIG_CRYPTO_FCRYPT=m
835CONFIG_CRYPTO_KHAZAD=m
836CONFIG_CRYPTO_SALSA20=m
837CONFIG_CRYPTO_SEED=m
838CONFIG_CRYPTO_SM4=m
839CONFIG_CRYPTO_TEA=m
787CONFIG_INDIRECT_PIO=y 840CONFIG_INDIRECT_PIO=y
788CONFIG_CMA_SIZE_MBYTES=320 841CONFIG_CMA_SIZE_MBYTES=320
789CONFIG_PRINTK_TIME=y 842CONFIG_PRINTK_TIME=y
@@ -795,3 +848,6 @@ CONFIG_DEBUG_KERNEL=y
795# CONFIG_DEBUG_PREEMPT is not set 848# CONFIG_DEBUG_PREEMPT is not set
796# CONFIG_FTRACE is not set 849# CONFIG_FTRACE is not set
797CONFIG_MEMTEST=y 850CONFIG_MEMTEST=y
851CONFIG_CORESIGHT=y
852CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
853CONFIG_CORESIGHT_SOURCE_ETM4X=y
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
index 906045ba..c1669ecf 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
@@ -13,7 +13,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
13# This recipe (and corresponding kernel repository and branch) receives updates 13# This recipe (and corresponding kernel repository and branch) receives updates
14# from 3 different sources: 14# from 3 different sources:
15# 1. Stable [linux-5.4.y] branch updates of korg; 15# 1. Stable [linux-5.4.y] branch updates of korg;
16# 2. NXP-specific updates via branch [lf-5.4.y] shared via CodeAurora forum; 16# 2. NXP-specific updates via branch [5.4-2.1.x-imx] shared via CodeAurora forum;
17# 3. Critical patches, which are not (yet) integrated into either of 2 above 17# 3. Critical patches, which are not (yet) integrated into either of 2 above
18# sources, but are required to be applied to the kernel tree. 18# sources, but are required to be applied to the kernel tree.
19# 19#
@@ -33,27 +33,21 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
33# ------------------------------------------------------------------------------ 33# ------------------------------------------------------------------------------
34# 2. NXP-specific (tag or SHA(s)) 34# 2. NXP-specific (tag or SHA(s))
35# ------------------------------------------------------------------------------ 35# ------------------------------------------------------------------------------
36# tag: lf-5.4.y-1.0.0 36# tag: rel_imx_5.4.24_2.1.0
37# 40fe6bd54230 MLK-23844-2 ARM64: dts: freescale: imx8mm: correct VDDARM@1.6GHz
38# aec0c14ae61d MLK-23844-1: ARM64: dts: freescale: imx8mn-ddr4-evk: cleanup Rhom pmic
39# e8e35fd0e759 MLK-23275-2: ARM64: dts: freescale: imx8mn-ddr4-evk: correct ldo1/ldo2 voltage
40# 975d8ab07267 MLK-23275-1: ARM64: dts: freescale: fsl-imx8mm-evk: correct ldo1/ldo2 voltage
41# 4711466d535c MLK-23562: regulator: core: adjust supply voltage in bypass
42# bbbc26a40a9c MLK-13793-6 regulator: anatop: fix min dropout for bypass mode
43# 37#
44# ------------------------------------------------------------------------------ 38# ------------------------------------------------------------------------------
45# 3. Critical patches (SHA(s)) 39# 3. Critical patches (SHA(s))
46# ------------------------------------------------------------------------------ 40# ------------------------------------------------------------------------------
47# bffbf24c88a7 fbdev: fix fbinfo flag dropped upstream 41# b3d088d2f8fa fbdev: fix fbinfo flag dropped upstream
48# fd34d250e9a5 arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs 42# c874333fa0be arm64: dts: imx8mp: Add fallback compatible to ocotp node
49# 4e0a3bc7b1af arm64: dts: imx8mn: Use "fsl,imx8mm-ocotp" as ocotp's fallback compatible 43# 55abb34c9faf arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs
50# 66af62de926c arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp 44# df1f59fb613e arm64: dts: imx8mn: Use "fsl,imx8mm-ocotp" as ocotp's fallback compatible
51# 19be176e9eed perf cs-etm: Move definition of 'traceid_list' global variable from header file 45# 7ad2a7f3fd6f arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp
52# d40fb1b86571 libtraceevent: Fix build with binutils 2.35 46# 959ad6073277 perf cs-etm: Move definition of 'traceid_list' global variable from header file
53# 0296957500a0 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL 47# 129a6fad43b8 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL
54# 804e520787f3 arm: imx: do not include smp_wfe_imx6.S for i.MX6SX 48# e85ce3157725 arm: imx: do not include smp_wfe_imx6.S for i.MX6SX
55# 0c01f815c1b4 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6 49# 4f49200132e6 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6
56# 691712e2b671 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ 50# 5d229c51b5a5 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ
57# 285869ec9087 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation 51# 285869ec9087 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation
58# f03791085754 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes 52# f03791085754 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes
59# 67e44952c670 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path' 53# 67e44952c670 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path'
@@ -78,8 +72,8 @@ include linux-fslc.inc
78LICENSE = "GPLv2" 72LICENSE = "GPLv2"
79LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" 73LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
80 74
81SRCBRANCH = "5.4-1.0.0-imx" 75SRCBRANCH = "5.4-2.1.x-imx"
82SRCREV = "c2576f8b8f2c1ed92ae1773b906a2986fc78ac5c" 76SRCREV = "001df9337baeeac2f649a87f929e8a985ad6360e"
83 77
84# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 78# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
85# required by kernel-yocto.bbclass. 79# required by kernel-yocto.bbclass.
@@ -89,7 +83,7 @@ SRCREV = "c2576f8b8f2c1ed92ae1773b906a2986fc78ac5c"
89LINUX_VERSION = "5.4.67" 83LINUX_VERSION = "5.4.67"
90 84
91# Local version indicates the branch name in the NXP kernel tree where patches are collected from. 85# Local version indicates the branch name in the NXP kernel tree where patches are collected from.
92LOCALVERSION = "-lf-5.4.y" 86LOCALVERSION = "-imx_5.4.24_2.1.0"
93 87
94DEFAULT_PREFERENCE = "1" 88DEFAULT_PREFERENCE = "1"
95 89