From: Cristinel Panfir Date: Tue, 13 Oct 2020 12:44:01 +0000 (+0300) Subject: linux-imx[-headers]: Upgrade to 5.4.47 from NXP X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9fdc5ec896e17bf032feb1f32dcf90812827a62c;p=meta-freescale.git linux-imx[-headers]: Upgrade to 5.4.47 from NXP - defconfigs: keep CRYPTO_DES and CRYPTO_SHA1 into kernel to avoid warnings - linux-imx-headers: update branch, same revision Signed-off-by: Cristinel Panfir --- diff --git a/recipes-kernel/linux/linux-imx-headers_5.4.bb b/recipes-kernel/linux/linux-imx-headers_5.4.bb index 54c4e8cb..ac460c0d 100644 --- a/recipes-kernel/linux/linux-imx-headers_5.4.bb +++ b/recipes-kernel/linux/linux-imx-headers_5.4.bb @@ -7,8 +7,8 @@ New headers are installed in ${includedir}/imx." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRCBRANCH = "imx_5.4.24_2.1.0" -LOCALVERSION = "-2.1.0" +SRCBRANCH = "imx_5.4.47_2.2.0" +LOCALVERSION = "-2.2.0" SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "dea2fede7e024ee7029b13e8d82a00ec14427777" diff --git a/recipes-kernel/linux/linux-imx/imx/defconfig b/recipes-kernel/linux/linux-imx/imx/defconfig index 30792d23..18761bae 100644 --- a/recipes-kernel/linux/linux-imx/imx/defconfig +++ b/recipes-kernel/linux/linux-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 @@ -561,7 +570,7 @@ CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA1=y CONFIG_CRC_CCITT=m CONFIG_CRC_T10DIF=y CONFIG_CRC7=m diff --git a/recipes-kernel/linux/linux-imx/mx8/defconfig b/recipes-kernel/linux/linux-imx/mx8/defconfig index cf8df95f..98099fe5 100644 --- a/recipes-kernel/linux/linux-imx/mx8/defconfig +++ b/recipes-kernel/linux/linux-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-imx_5.4.bb b/recipes-kernel/linux/linux-imx_5.4.bb index 8c56b986..4a04d396 100644 --- a/recipes-kernel/linux/linux-imx_5.4.bb +++ b/recipes-kernel/linux/linux-imx_5.4.bb @@ -17,16 +17,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "lzop-native bc-native" -SRCBRANCH = "imx_5.4.24_2.1.0" -LOCALVERSION = "-2.1.0" -SRCREV = "babac008e5cf168abca1a85bda2e8071ca27a5c0" +SRCBRANCH = "imx_5.4.47_2.2.0" +LOCALVERSION = "-2.2.0" +SRCREV = "5ec03d06f54e6728c973efccb7edf20d071e2096" # 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.24" +LINUX_VERSION = "5.4.47" DEFAULT_PREFERENCE = "1"