From c33e27e1f2176ed280a4820ebe52d22154120e53 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Sun, 1 Nov 2020 21:23:35 +0000 Subject: [PATCH] linux-fslc-imx: upgrade to rel_imx_5.4.47_2.2.0 from NXP Kernel repository has a new branch introduced, which is based on NXP release 5.4.47-2.2.0 and has latest stable patchlevel applied to it. Current version of up-merged kernel is 5.4.74 and also contains following patches cherry-picked from imx_5.4.47_2.2.0 branch which were applied after release tag: 5ec03d06f54e MLK-24836 ARM: imx: Refresh wdog should consider the CMD mode on i.MX7ULP bba6ff64f0df MLK-24824-3 ARM: imx: Refresh wdog1 to make sure it is NOT timeout before disabled bad81140da7c MLK-24828 ARM: imx: Add revision support for i.MX7ULP rev 2.2 99fb4d4619ff MLK-24824-2 watchdog: imx7ulp: Move suspend/resume to noirq phase 8c8859e1c5b5 MLK-24824-1 watchdog: imx7ulp: Strictly follow the sequence for wdog operations Update kernel recipe to include new kernel version and align kernel config files based on following NXP configurations: - imx_v8_defconfig used for i.MX8 family - imx_v7_defconfig used for i.MX6/7 families Tracking information in recipe is updated to include new branch, tag and cherry-picks from NXP branch, together with patches applied from various sources. Signed-off-by: Andrey Zhizhikin --- .../linux/linux-fslc-imx/imx/defconfig | 11 +++++- .../linux/linux-fslc-imx/mx8/defconfig | 34 +++++++++++++++++-- recipes-kernel/linux/linux-fslc-imx_5.4.bb | 20 +++++++---- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/imx/defconfig index 742400a9..3029043b 100644 --- a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/imx/defconfig @@ -99,7 +99,11 @@ CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=y CONFIG_PCI=y CONFIG_PCI_MSI=y -CONFIG_PCI_IMX6=y +CONFIG_PCI_IMX6_HOST=y +CONFIG_PCI_IMX6_EP=y +CONFIG_PCI_ENDPOINT=y +CONFIG_PCI_ENDPOINT_CONFIGFS=y +CONFIG_PCI_EPF_TEST=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set @@ -134,6 +138,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=65536 CONFIG_SENSORS_FXOS8700=y CONFIG_SENSORS_FXAS2100X=y +CONFIG_PCI_ENDPOINT_TEST=y CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=y # CONFIG_SCSI_PROC_FS is not set @@ -146,6 +151,10 @@ CONFIG_ATA=y CONFIG_SATA_AHCI_PLATFORM=y CONFIG_AHCI_IMX=y CONFIG_PATA_IMX=y +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_BROADCOM is not set CONFIG_CS89x0=y diff --git a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig index 1e9ee4f8..4e7d4a9f 100644 --- a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig @@ -179,11 +179,15 @@ CONFIG_PCIE_ALTERA=y CONFIG_PCIE_ALTERA_MSI=y CONFIG_PCI_HOST_THUNDER_PEM=y CONFIG_PCI_HOST_THUNDER_ECAM=y -CONFIG_PCI_IMX6=y +CONFIG_PCI_IMX6_HOST=y +CONFIG_PCI_IMX6_EP=y CONFIG_PCI_LAYERSCAPE=y CONFIG_PCI_HISI=y CONFIG_PCIE_KIRIN=y CONFIG_PCIE_LAYERSCAPE_GEN4=y +CONFIG_PCI_ENDPOINT=y +CONFIG_PCI_ENDPOINT_CONFIGFS=y +CONFIG_PCI_EPF_TEST=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER=y @@ -220,6 +224,7 @@ CONFIG_BLK_DEV_NVME=y CONFIG_SENSORS_FXOS8700=y CONFIG_SENSORS_FXAS2100X=y CONFIG_SRAM=y +CONFIG_PCI_ENDPOINT_TEST=y CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=m # CONFIG_SCSI_PROC_FS is not set @@ -243,6 +248,7 @@ CONFIG_PATA_OF_PLATFORM=y CONFIG_MD=y CONFIG_BLK_DEV_MD=m CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_NETDEVICES=y @@ -312,6 +318,7 @@ CONFIG_HOSTAP=y CONFIG_MXMWIFIEX=m CONFIG_WL18XX=m CONFIG_WLCORE_SDIO=m +CONFIG_XEN_NETDEV_BACKEND=m CONFIG_IVSHMEM_NET=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m @@ -453,7 +460,19 @@ CONFIG_REGULATOR_S2MPS11=y CONFIG_REGULATOR_VCTRL=m CONFIG_RC_CORE=m CONFIG_RC_DECODERS=y +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_IR_IMON_DECODER=m +CONFIG_IR_RCMM_DECODER=m CONFIG_RC_DEVICES=y +CONFIG_IR_GPIO_CIR=m CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y @@ -482,6 +501,7 @@ CONFIG_DRM_RCAR_LVDS=m CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_RAYDIUM_RM67191=y CONFIG_DRM_PANEL_SEIKO_43WVF1G=y +CONFIG_DRM_NXP_SEIKO_43WVFIG=y CONFIG_DRM_FSL_IMX_LVDS_BRIDGE=y CONFIG_DRM_SII902X=m CONFIG_DRM_I2C_ADV7511=y @@ -570,6 +590,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_HCD_TEST_MODE=y CONFIG_USB_ACM=m CONFIG_USB_STORAGE=y +CONFIG_USB_UAS=y CONFIG_USB_CDNS3=y CONFIG_USB_CDNS3_GADGET=y CONFIG_USB_CDNS3_HOST=y @@ -586,7 +607,7 @@ CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_SIMPLE=y CONFIG_USB_SERIAL_FTDI_SIO=y CONFIG_USB_TEST=m -CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_USB_EHSET_TEST_FIXTURE=y CONFIG_USB_HSIC_USB3503=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_MXS_PHY=y @@ -851,3 +872,12 @@ CONFIG_MEMTEST=y CONFIG_CORESIGHT=y CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y CONFIG_CORESIGHT_SOURCE_ETM4X=y +CONFIG_IMX8_MEDIA_DEVICE=m +CONFIG_IMX8_ISI_HW=y +CONFIG_IMX8_ISI_CORE=y +CONFIG_IMX8_ISI_CAPTURE=y +CONFIG_IMX8_ISI_M2M=y +CONFIG_IMX8_MIPI_CSI2=y +CONFIG_IMX8_MIPI_CSI2_SAM=y +CONFIG_IMX8_PARALLEL_CSI=y +CONFIG_GMSL_MAX9286=y diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index fa3cdc1c..241ca675 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." # This recipe (and corresponding kernel repository and branch) receives updates # from 3 different sources: # 1. Stable [linux-5.4.y] branch updates of korg; -# 2. NXP-specific updates via branch [5.4-2.1.x-imx] shared via CodeAurora forum; +# 2. NXP-specific updates via branch [5.4-2.2.x-imx] shared via CodeAurora forum; # 3. Critical patches, which are not (yet) integrated into either of 2 above # sources, but are required to be applied to the kernel tree. # @@ -28,12 +28,18 @@ Latest stable Kernel patchlevel is applied and maintained by Community." # ------------------------------------------------------------------------------ # 1. Stable (tag or SHA(s)) # ------------------------------------------------------------------------------ -# tag: v5.4.80 +# tag: v5.4.74 # # ------------------------------------------------------------------------------ # 2. NXP-specific (tag or SHA(s)) # ------------------------------------------------------------------------------ -# tag: rel_imx_5.4.24_2.1.0 +# tag: rel_imx_5.4.47_2.2.0 +# +# 5ec03d06f54e MLK-24836 ARM: imx: Refresh wdog should consider the CMD mode on i.MX7ULP +# bba6ff64f0df MLK-24824-3 ARM: imx: Refresh wdog1 to make sure it is NOT timeout before disabled +# bad81140da7c MLK-24828 ARM: imx: Add revision support for i.MX7ULP rev 2.2 +# 99fb4d4619ff MLK-24824-2 watchdog: imx7ulp: Move suspend/resume to noirq phase +# 8c8859e1c5b5 MLK-24824-1 watchdog: imx7ulp: Strictly follow the sequence for wdog operations # # ------------------------------------------------------------------------------ # 3. Critical patches (SHA(s)) @@ -72,18 +78,18 @@ include linux-fslc.inc LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRCBRANCH = "5.4-2.1.x-imx" -SRCREV = "5d0d8d6f195dbd50ec4790df32896bdc87cf8b33" +SRCBRANCH = "5.4-2.2.x-imx" +SRCREV = "10865293a7cc3ebca17a1ed9e2d3dff6a8882097" # 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.4.80" +LINUX_VERSION = "5.4.74" # Local version indicates the branch name in the NXP kernel tree where patches are collected from. -LOCALVERSION = "-imx-5.4.24-2.1.0" +LOCALVERSION = "-imx-5.4.47-2.2.0" DEFAULT_PREFERENCE = "1" -- 2.40.1