summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorCristinel Panfir <cristinel.panfir@nxp.com>2020-10-13 15:44:01 +0300
committerOtavio Salvador <otavio@ossystems.com.br>2020-10-20 10:24:32 -0300
commit9fdc5ec896e17bf032feb1f32dcf90812827a62c (patch)
tree9ac192978420972964042a1c24adc57181860221 /recipes-kernel
parent346197c11b74b17974d8b260ac83f1d7d170e79b (diff)
downloadmeta-freescale-9fdc5ec896e17bf032feb1f32dcf90812827a62c.tar.gz
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 <cristinel.panfir@nxp.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-imx-headers_5.4.bb4
-rw-r--r--recipes-kernel/linux/linux-imx/imx/defconfig13
-rw-r--r--recipes-kernel/linux/linux-imx/mx8/defconfig34
-rw-r--r--recipes-kernel/linux/linux-imx_5.4.bb8
4 files changed, 49 insertions, 10 deletions
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."
7LICENSE = "GPLv2" 7LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" 8LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
9 9
10SRCBRANCH = "imx_5.4.24_2.1.0" 10SRCBRANCH = "imx_5.4.47_2.2.0"
11LOCALVERSION = "-2.1.0" 11LOCALVERSION = "-2.2.0"
12SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" 12SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
13SRCREV = "dea2fede7e024ee7029b13e8d82a00ec14427777" 13SRCREV = "dea2fede7e024ee7029b13e8d82a00ec14427777"
14 14
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
99CONFIG_MAC80211=y 99CONFIG_MAC80211=y
100CONFIG_PCI=y 100CONFIG_PCI=y
101CONFIG_PCI_MSI=y 101CONFIG_PCI_MSI=y
102CONFIG_PCI_IMX6=y 102CONFIG_PCI_IMX6_HOST=y
103CONFIG_PCI_IMX6_EP=y
104CONFIG_PCI_ENDPOINT=y
105CONFIG_PCI_ENDPOINT_CONFIGFS=y
106CONFIG_PCI_EPF_TEST=y
103CONFIG_DEVTMPFS=y 107CONFIG_DEVTMPFS=y
104CONFIG_DEVTMPFS_MOUNT=y 108CONFIG_DEVTMPFS_MOUNT=y
105# CONFIG_STANDALONE is not set 109# CONFIG_STANDALONE is not set
@@ -134,6 +138,7 @@ CONFIG_BLK_DEV_RAM=y
134CONFIG_BLK_DEV_RAM_SIZE=65536 138CONFIG_BLK_DEV_RAM_SIZE=65536
135CONFIG_SENSORS_FXOS8700=y 139CONFIG_SENSORS_FXOS8700=y
136CONFIG_SENSORS_FXAS2100X=y 140CONFIG_SENSORS_FXAS2100X=y
141CONFIG_PCI_ENDPOINT_TEST=y
137CONFIG_EEPROM_AT24=y 142CONFIG_EEPROM_AT24=y
138CONFIG_EEPROM_AT25=y 143CONFIG_EEPROM_AT25=y
139# CONFIG_SCSI_PROC_FS is not set 144# CONFIG_SCSI_PROC_FS is not set
@@ -146,6 +151,10 @@ CONFIG_ATA=y
146CONFIG_SATA_AHCI_PLATFORM=y 151CONFIG_SATA_AHCI_PLATFORM=y
147CONFIG_AHCI_IMX=y 152CONFIG_AHCI_IMX=y
148CONFIG_PATA_IMX=y 153CONFIG_PATA_IMX=y
154CONFIG_MD=y
155CONFIG_BLK_DEV_MD=m
156CONFIG_BLK_DEV_DM=m
157CONFIG_DM_CRYPT=m
149CONFIG_NETDEVICES=y 158CONFIG_NETDEVICES=y
150# CONFIG_NET_VENDOR_BROADCOM is not set 159# CONFIG_NET_VENDOR_BROADCOM is not set
151CONFIG_CS89x0=y 160CONFIG_CS89x0=y
@@ -561,7 +570,7 @@ CONFIG_CRYPTO_SEED=m
561CONFIG_CRYPTO_SM4=m 570CONFIG_CRYPTO_SM4=m
562CONFIG_CRYPTO_TEA=m 571CONFIG_CRYPTO_TEA=m
563CONFIG_CRYPTO_ANSI_CPRNG=m 572CONFIG_CRYPTO_ANSI_CPRNG=m
564CONFIG_CRYPTO_SHA1=m 573CONFIG_CRYPTO_SHA1=y
565CONFIG_CRC_CCITT=m 574CONFIG_CRC_CCITT=m
566CONFIG_CRC_T10DIF=y 575CONFIG_CRC_T10DIF=y
567CONFIG_CRC7=m 576CONFIG_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
179CONFIG_PCIE_ALTERA_MSI=y 179CONFIG_PCIE_ALTERA_MSI=y
180CONFIG_PCI_HOST_THUNDER_PEM=y 180CONFIG_PCI_HOST_THUNDER_PEM=y
181CONFIG_PCI_HOST_THUNDER_ECAM=y 181CONFIG_PCI_HOST_THUNDER_ECAM=y
182CONFIG_PCI_IMX6=y 182CONFIG_PCI_IMX6_HOST=y
183CONFIG_PCI_IMX6_EP=y
183CONFIG_PCI_LAYERSCAPE=y 184CONFIG_PCI_LAYERSCAPE=y
184CONFIG_PCI_HISI=y 185CONFIG_PCI_HISI=y
185CONFIG_PCIE_KIRIN=y 186CONFIG_PCIE_KIRIN=y
186CONFIG_PCIE_LAYERSCAPE_GEN4=y 187CONFIG_PCIE_LAYERSCAPE_GEN4=y
188CONFIG_PCI_ENDPOINT=y
189CONFIG_PCI_ENDPOINT_CONFIGFS=y
190CONFIG_PCI_EPF_TEST=y
187CONFIG_DEVTMPFS=y 191CONFIG_DEVTMPFS=y
188CONFIG_DEVTMPFS_MOUNT=y 192CONFIG_DEVTMPFS_MOUNT=y
189CONFIG_FW_LOADER_USER_HELPER=y 193CONFIG_FW_LOADER_USER_HELPER=y
@@ -220,6 +224,7 @@ CONFIG_BLK_DEV_NVME=y
220CONFIG_SENSORS_FXOS8700=y 224CONFIG_SENSORS_FXOS8700=y
221CONFIG_SENSORS_FXAS2100X=y 225CONFIG_SENSORS_FXAS2100X=y
222CONFIG_SRAM=y 226CONFIG_SRAM=y
227CONFIG_PCI_ENDPOINT_TEST=y
223CONFIG_EEPROM_AT24=y 228CONFIG_EEPROM_AT24=y
224CONFIG_EEPROM_AT25=m 229CONFIG_EEPROM_AT25=m
225# CONFIG_SCSI_PROC_FS is not set 230# CONFIG_SCSI_PROC_FS is not set
@@ -243,6 +248,7 @@ CONFIG_PATA_OF_PLATFORM=y
243CONFIG_MD=y 248CONFIG_MD=y
244CONFIG_BLK_DEV_MD=m 249CONFIG_BLK_DEV_MD=m
245CONFIG_BLK_DEV_DM=m 250CONFIG_BLK_DEV_DM=m
251CONFIG_DM_CRYPT=m
246CONFIG_DM_MIRROR=m 252CONFIG_DM_MIRROR=m
247CONFIG_DM_ZERO=m 253CONFIG_DM_ZERO=m
248CONFIG_NETDEVICES=y 254CONFIG_NETDEVICES=y
@@ -312,6 +318,7 @@ CONFIG_HOSTAP=y
312CONFIG_MXMWIFIEX=m 318CONFIG_MXMWIFIEX=m
313CONFIG_WL18XX=m 319CONFIG_WL18XX=m
314CONFIG_WLCORE_SDIO=m 320CONFIG_WLCORE_SDIO=m
321CONFIG_XEN_NETDEV_BACKEND=m
315CONFIG_IVSHMEM_NET=y 322CONFIG_IVSHMEM_NET=y
316CONFIG_INPUT_EVDEV=y 323CONFIG_INPUT_EVDEV=y
317CONFIG_KEYBOARD_ADC=m 324CONFIG_KEYBOARD_ADC=m
@@ -453,7 +460,19 @@ CONFIG_REGULATOR_S2MPS11=y
453CONFIG_REGULATOR_VCTRL=m 460CONFIG_REGULATOR_VCTRL=m
454CONFIG_RC_CORE=m 461CONFIG_RC_CORE=m
455CONFIG_RC_DECODERS=y 462CONFIG_RC_DECODERS=y
463CONFIG_IR_NEC_DECODER=m
464CONFIG_IR_RC5_DECODER=m
465CONFIG_IR_RC6_DECODER=m
466CONFIG_IR_JVC_DECODER=m
467CONFIG_IR_SONY_DECODER=m
468CONFIG_IR_SANYO_DECODER=m
469CONFIG_IR_SHARP_DECODER=m
470CONFIG_IR_MCE_KBD_DECODER=m
471CONFIG_IR_XMP_DECODER=m
472CONFIG_IR_IMON_DECODER=m
473CONFIG_IR_RCMM_DECODER=m
456CONFIG_RC_DEVICES=y 474CONFIG_RC_DEVICES=y
475CONFIG_IR_GPIO_CIR=m
457CONFIG_MEDIA_SUPPORT=y 476CONFIG_MEDIA_SUPPORT=y
458CONFIG_MEDIA_CAMERA_SUPPORT=y 477CONFIG_MEDIA_CAMERA_SUPPORT=y
459CONFIG_MEDIA_ANALOG_TV_SUPPORT=y 478CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
@@ -482,6 +501,7 @@ CONFIG_DRM_RCAR_LVDS=m
482CONFIG_DRM_PANEL_SIMPLE=y 501CONFIG_DRM_PANEL_SIMPLE=y
483CONFIG_DRM_PANEL_RAYDIUM_RM67191=y 502CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
484CONFIG_DRM_PANEL_SEIKO_43WVF1G=y 503CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
504CONFIG_DRM_NXP_SEIKO_43WVFIG=y
485CONFIG_DRM_FSL_IMX_LVDS_BRIDGE=y 505CONFIG_DRM_FSL_IMX_LVDS_BRIDGE=y
486CONFIG_DRM_SII902X=m 506CONFIG_DRM_SII902X=m
487CONFIG_DRM_I2C_ADV7511=y 507CONFIG_DRM_I2C_ADV7511=y
@@ -570,6 +590,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
570CONFIG_USB_HCD_TEST_MODE=y 590CONFIG_USB_HCD_TEST_MODE=y
571CONFIG_USB_ACM=m 591CONFIG_USB_ACM=m
572CONFIG_USB_STORAGE=y 592CONFIG_USB_STORAGE=y
593CONFIG_USB_UAS=y
573CONFIG_USB_CDNS3=y 594CONFIG_USB_CDNS3=y
574CONFIG_USB_CDNS3_GADGET=y 595CONFIG_USB_CDNS3_GADGET=y
575CONFIG_USB_CDNS3_HOST=y 596CONFIG_USB_CDNS3_HOST=y
@@ -586,7 +607,7 @@ CONFIG_USB_SERIAL_GENERIC=y
586CONFIG_USB_SERIAL_SIMPLE=y 607CONFIG_USB_SERIAL_SIMPLE=y
587CONFIG_USB_SERIAL_FTDI_SIO=y 608CONFIG_USB_SERIAL_FTDI_SIO=y
588CONFIG_USB_TEST=m 609CONFIG_USB_TEST=m
589CONFIG_USB_EHSET_TEST_FIXTURE=m 610CONFIG_USB_EHSET_TEST_FIXTURE=y
590CONFIG_USB_HSIC_USB3503=y 611CONFIG_USB_HSIC_USB3503=y
591CONFIG_NOP_USB_XCEIV=y 612CONFIG_NOP_USB_XCEIV=y
592CONFIG_USB_MXS_PHY=y 613CONFIG_USB_MXS_PHY=y
@@ -851,3 +872,12 @@ CONFIG_MEMTEST=y
851CONFIG_CORESIGHT=y 872CONFIG_CORESIGHT=y
852CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y 873CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
853CONFIG_CORESIGHT_SOURCE_ETM4X=y 874CONFIG_CORESIGHT_SOURCE_ETM4X=y
875CONFIG_IMX8_MEDIA_DEVICE=m
876CONFIG_IMX8_ISI_HW=y
877CONFIG_IMX8_ISI_CORE=y
878CONFIG_IMX8_ISI_CAPTURE=y
879CONFIG_IMX8_ISI_M2M=y
880CONFIG_IMX8_MIPI_CSI2=y
881CONFIG_IMX8_MIPI_CSI2_SAM=y
882CONFIG_IMX8_PARALLEL_CSI=y
883CONFIG_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"
17 17
18DEPENDS += "lzop-native bc-native" 18DEPENDS += "lzop-native bc-native"
19 19
20SRCBRANCH = "imx_5.4.24_2.1.0" 20SRCBRANCH = "imx_5.4.47_2.2.0"
21LOCALVERSION = "-2.1.0" 21LOCALVERSION = "-2.2.0"
22SRCREV = "babac008e5cf168abca1a85bda2e8071ca27a5c0" 22SRCREV = "5ec03d06f54e6728c973efccb7edf20d071e2096"
23 23
24# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 24# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
25# required by kernel-yocto.bbclass. 25# required by kernel-yocto.bbclass.
26# 26#
27# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 27# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
28# should be updated once patchlevel is merged. 28# should be updated once patchlevel is merged.
29LINUX_VERSION = "5.4.24" 29LINUX_VERSION = "5.4.47"
30 30
31DEFAULT_PREFERENCE = "1" 31DEFAULT_PREFERENCE = "1"
32 32