diff options
author | Fabio Berton <fabio.berton@ossystems.com.br> | 2020-12-09 11:33:14 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2020-12-11 19:37:54 -0300 |
commit | 60d3bf09399924803a7440067144ca7f8dd01f42 (patch) | |
tree | cbd2c53dc52016e4f2ff0ebab95f1a3d77b4bd65 | |
parent | c2c739a93b143feaa0d8a60c4d7a87f95ee363d9 (diff) | |
download | meta-freescale-60d3bf09399924803a7440067144ca7f8dd01f42.tar.gz |
linux-fslc: Update to version 5.10.x
Sync defconfig with imx_v6_v7_defconfig, mx25/defconfig with
imx_v4_v5_defconfig and mxs/defconfig with mxs_defconfig
The commit:
commit 74835c7db0322b6eddf091b8b062f127b8999a0a
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu Feb 6 16:48:00 2020 +0100
COPYING: state that all contributions really are covered by this file
Explicitly state that all contributions to the kernel source tree
really are covered under this COPYING file in case someone thought
otherwise. Lawyers love to be pedantic, even more so than software
engineers at times, and this sentence makes them sleep easier.
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Link: https://lore.kernel.org/r/20200206154800.GA3754085@kroah.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
changed the COPYING file, update md5 checksum to match to this new file.
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
-rw-r--r-- | recipes-kernel/linux/linux-fslc/defconfig | 44 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/mx25/defconfig | 6 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc/mxs/defconfig | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_5.10.bb (renamed from recipes-kernel/linux/linux-fslc_5.4.bb) | 8 |
4 files changed, 31 insertions, 29 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index dbb2387c..5e216107 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig | |||
@@ -15,20 +15,8 @@ CONFIG_PERF_EVENTS=y | |||
15 | # CONFIG_COMPAT_BRK is not set | 15 | # CONFIG_COMPAT_BRK is not set |
16 | CONFIG_ARCH_MULTI_V6=y | 16 | CONFIG_ARCH_MULTI_V6=y |
17 | CONFIG_ARCH_MXC=y | 17 | CONFIG_ARCH_MXC=y |
18 | CONFIG_MACH_MX31LILLY=y | 18 | CONFIG_SOC_IMX31=y |
19 | CONFIG_MACH_MX31LITE=y | 19 | CONFIG_SOC_IMX35=y |
20 | CONFIG_MACH_PCM037=y | ||
21 | CONFIG_MACH_PCM037_EET=y | ||
22 | CONFIG_MACH_MX31_3DS=y | ||
23 | CONFIG_MACH_MX31MOBOARD=y | ||
24 | CONFIG_MACH_QONG=y | ||
25 | CONFIG_MACH_ARMADILLO5X0=y | ||
26 | CONFIG_MACH_KZM_ARM11_01=y | ||
27 | CONFIG_MACH_IMX31_DT=y | ||
28 | CONFIG_MACH_IMX35_DT=y | ||
29 | CONFIG_MACH_PCM043=y | ||
30 | CONFIG_MACH_MX35_3DS=y | ||
31 | CONFIG_MACH_VPR200=y | ||
32 | CONFIG_SOC_IMX50=y | 20 | CONFIG_SOC_IMX50=y |
33 | CONFIG_SOC_IMX51=y | 21 | CONFIG_SOC_IMX51=y |
34 | CONFIG_SOC_IMX53=y | 22 | CONFIG_SOC_IMX53=y |
@@ -178,8 +166,13 @@ CONFIG_MOUSE_PS2=m | |||
178 | CONFIG_MOUSE_PS2_ELANTECH=y | 166 | CONFIG_MOUSE_PS2_ELANTECH=y |
179 | CONFIG_INPUT_TOUCHSCREEN=y | 167 | CONFIG_INPUT_TOUCHSCREEN=y |
180 | CONFIG_TOUCHSCREEN_ADS7846=y | 168 | CONFIG_TOUCHSCREEN_ADS7846=y |
169 | CONFIG_TOUCHSCREEN_AD7879=y | ||
170 | CONFIG_TOUCHSCREEN_AD7879_I2C=y | ||
171 | CONFIG_TOUCHSCREEN_ATMEL_MXT=y | ||
172 | CONFIG_TOUCHSCREEN_DA9052=y | ||
181 | CONFIG_TOUCHSCREEN_EGALAX=y | 173 | CONFIG_TOUCHSCREEN_EGALAX=y |
182 | CONFIG_TOUCHSCREEN_GOODIX=y | 174 | CONFIG_TOUCHSCREEN_GOODIX=y |
175 | CONFIG_TOUCHSCREEN_ILI210X=y | ||
183 | CONFIG_TOUCHSCREEN_MAX11801=y | 176 | CONFIG_TOUCHSCREEN_MAX11801=y |
184 | CONFIG_TOUCHSCREEN_IMX6UL_TSC=y | 177 | CONFIG_TOUCHSCREEN_IMX6UL_TSC=y |
185 | CONFIG_TOUCHSCREEN_EDT_FT5X06=y | 178 | CONFIG_TOUCHSCREEN_EDT_FT5X06=y |
@@ -211,6 +204,10 @@ CONFIG_SPI=y | |||
211 | CONFIG_SPI_GPIO=y | 204 | CONFIG_SPI_GPIO=y |
212 | CONFIG_SPI_IMX=y | 205 | CONFIG_SPI_IMX=y |
213 | CONFIG_SPI_FSL_DSPI=y | 206 | CONFIG_SPI_FSL_DSPI=y |
207 | CONFIG_PINCTRL_IMX8MM=y | ||
208 | CONFIG_PINCTRL_IMX8MN=y | ||
209 | CONFIG_PINCTRL_IMX8MP=y | ||
210 | CONFIG_PINCTRL_IMX8MQ=y | ||
214 | CONFIG_GPIO_SYSFS=y | 211 | CONFIG_GPIO_SYSFS=y |
215 | CONFIG_GPIO_SIOX=m | 212 | CONFIG_GPIO_SIOX=m |
216 | CONFIG_GPIO_MAX732X=y | 213 | CONFIG_GPIO_MAX732X=y |
@@ -219,6 +216,7 @@ CONFIG_GPIO_PCA953X=y | |||
219 | CONFIG_GPIO_PCF857X=y | 216 | CONFIG_GPIO_PCF857X=y |
220 | CONFIG_GPIO_STMPE=y | 217 | CONFIG_GPIO_STMPE=y |
221 | CONFIG_GPIO_74X164=y | 218 | CONFIG_GPIO_74X164=y |
219 | CONFIG_GPIO_MXC=y | ||
222 | CONFIG_POWER_RESET=y | 220 | CONFIG_POWER_RESET=y |
223 | CONFIG_POWER_RESET_SYSCON=y | 221 | CONFIG_POWER_RESET_SYSCON=y |
224 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y | 222 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y |
@@ -235,6 +233,7 @@ CONFIG_DA9062_WATCHDOG=y | |||
235 | CONFIG_DA9063_WATCHDOG=m | 233 | CONFIG_DA9063_WATCHDOG=m |
236 | CONFIG_RN5T618_WATCHDOG=y | 234 | CONFIG_RN5T618_WATCHDOG=y |
237 | CONFIG_IMX2_WDT=y | 235 | CONFIG_IMX2_WDT=y |
236 | CONFIG_IMX7ULP_WDT=y | ||
238 | CONFIG_MFD_DA9052_I2C=y | 237 | CONFIG_MFD_DA9052_I2C=y |
239 | CONFIG_MFD_DA9062=y | 238 | CONFIG_MFD_DA9062=y |
240 | CONFIG_MFD_DA9063=y | 239 | CONFIG_MFD_DA9063=y |
@@ -264,7 +263,6 @@ CONFIG_MEDIA_USB_SUPPORT=y | |||
264 | CONFIG_USB_VIDEO_CLASS=m | 263 | CONFIG_USB_VIDEO_CLASS=m |
265 | CONFIG_V4L_PLATFORM_DRIVERS=y | 264 | CONFIG_V4L_PLATFORM_DRIVERS=y |
266 | CONFIG_VIDEO_MUX=y | 265 | CONFIG_VIDEO_MUX=y |
267 | CONFIG_SOC_CAMERA=y | ||
268 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 266 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
269 | CONFIG_VIDEO_CODA=m | 267 | CONFIG_VIDEO_CODA=m |
270 | CONFIG_VIDEO_IMX_PXP=y | 268 | CONFIG_VIDEO_IMX_PXP=y |
@@ -279,6 +277,7 @@ CONFIG_DRM_MSM=y | |||
279 | CONFIG_DRM_PANEL_LVDS=y | 277 | CONFIG_DRM_PANEL_LVDS=y |
280 | CONFIG_DRM_PANEL_SIMPLE=y | 278 | CONFIG_DRM_PANEL_SIMPLE=y |
281 | CONFIG_DRM_PANEL_SEIKO_43WVF1G=y | 279 | CONFIG_DRM_PANEL_SEIKO_43WVF1G=y |
280 | CONFIG_DRM_TI_TFP410=y | ||
282 | CONFIG_DRM_DW_HDMI_AHB_AUDIO=m | 281 | CONFIG_DRM_DW_HDMI_AHB_AUDIO=m |
283 | CONFIG_DRM_DW_HDMI_CEC=y | 282 | CONFIG_DRM_DW_HDMI_CEC=y |
284 | CONFIG_DRM_IMX=y | 283 | CONFIG_DRM_IMX=y |
@@ -320,6 +319,7 @@ CONFIG_USB=y | |||
320 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | 319 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y |
321 | CONFIG_USB_EHCI_HCD=y | 320 | CONFIG_USB_EHCI_HCD=y |
322 | CONFIG_USB_EHCI_MXC=y | 321 | CONFIG_USB_EHCI_MXC=y |
322 | CONFIG_USB_ACM=m | ||
323 | CONFIG_USB_STORAGE=y | 323 | CONFIG_USB_STORAGE=y |
324 | CONFIG_USB_CHIPIDEA=y | 324 | CONFIG_USB_CHIPIDEA=y |
325 | CONFIG_USB_CHIPIDEA_UDC=y | 325 | CONFIG_USB_CHIPIDEA_UDC=y |
@@ -334,7 +334,7 @@ CONFIG_NOP_USB_XCEIV=y | |||
334 | CONFIG_USB_MXS_PHY=y | 334 | CONFIG_USB_MXS_PHY=y |
335 | CONFIG_USB_GADGET=y | 335 | CONFIG_USB_GADGET=y |
336 | CONFIG_USB_FSL_USB2=y | 336 | CONFIG_USB_FSL_USB2=y |
337 | CONFIG_USB_CONFIGFS=m | 337 | CONFIG_USB_CONFIGFS=y |
338 | CONFIG_USB_CONFIGFS_SERIAL=y | 338 | CONFIG_USB_CONFIGFS_SERIAL=y |
339 | CONFIG_USB_CONFIGFS_ACM=y | 339 | CONFIG_USB_CONFIGFS_ACM=y |
340 | CONFIG_USB_CONFIGFS_OBEX=y | 340 | CONFIG_USB_CONFIGFS_OBEX=y |
@@ -386,6 +386,7 @@ CONFIG_RTC_DRV_DA9063=y | |||
386 | CONFIG_RTC_DRV_MC13XXX=y | 386 | CONFIG_RTC_DRV_MC13XXX=y |
387 | CONFIG_RTC_DRV_MXC=y | 387 | CONFIG_RTC_DRV_MXC=y |
388 | CONFIG_RTC_DRV_MXC_V2=y | 388 | CONFIG_RTC_DRV_MXC_V2=y |
389 | CONFIG_RTC_DRV_RC5T619=y | ||
389 | CONFIG_RTC_DRV_SNVS=y | 390 | CONFIG_RTC_DRV_SNVS=y |
390 | CONFIG_DMADEVICES=y | 391 | CONFIG_DMADEVICES=y |
391 | CONFIG_FSL_EDMA=y | 392 | CONFIG_FSL_EDMA=y |
@@ -396,9 +397,15 @@ CONFIG_STAGING=y | |||
396 | CONFIG_STAGING_MEDIA=y | 397 | CONFIG_STAGING_MEDIA=y |
397 | CONFIG_VIDEO_IMX_MEDIA=y | 398 | CONFIG_VIDEO_IMX_MEDIA=y |
398 | CONFIG_COMMON_CLK_PWM=y | 399 | CONFIG_COMMON_CLK_PWM=y |
400 | CONFIG_CLK_IMX8MM=y | ||
401 | CONFIG_CLK_IMX8MN=y | ||
402 | CONFIG_CLK_IMX8MP=y | ||
403 | CONFIG_CLK_IMX8MQ=y | ||
404 | CONFIG_SOC_IMX8M=y | ||
399 | CONFIG_IIO=y | 405 | CONFIG_IIO=y |
400 | CONFIG_MMA8452=y | 406 | CONFIG_MMA8452=y |
401 | CONFIG_IMX7D_ADC=y | 407 | CONFIG_IMX7D_ADC=y |
408 | CONFIG_RN5T618_ADC=y | ||
402 | CONFIG_VF610_ADC=y | 409 | CONFIG_VF610_ADC=y |
403 | CONFIG_SENSORS_ISL29018=y | 410 | CONFIG_SENSORS_ISL29018=y |
404 | CONFIG_MAG3110=y | 411 | CONFIG_MAG3110=y |
@@ -439,6 +446,8 @@ CONFIG_UBIFS_FS=y | |||
439 | CONFIG_NFS_FS=y | 446 | CONFIG_NFS_FS=y |
440 | CONFIG_NFS_V3_ACL=y | 447 | CONFIG_NFS_V3_ACL=y |
441 | CONFIG_NFS_V4=y | 448 | CONFIG_NFS_V4=y |
449 | CONFIG_NFS_V4_1=y | ||
450 | CONFIG_NFS_V4_2=y | ||
442 | CONFIG_ROOT_NFS=y | 451 | CONFIG_ROOT_NFS=y |
443 | CONFIG_NLS_DEFAULT="cp437" | 452 | CONFIG_NLS_DEFAULT="cp437" |
444 | CONFIG_NLS_CODEPAGE_437=y | 453 | CONFIG_NLS_CODEPAGE_437=y |
@@ -464,6 +473,3 @@ CONFIG_DEBUG_FS=y | |||
464 | CONFIG_PROVE_LOCKING=y | 473 | CONFIG_PROVE_LOCKING=y |
465 | # CONFIG_DEBUG_BUGVERBOSE is not set | 474 | # CONFIG_DEBUG_BUGVERBOSE is not set |
466 | # CONFIG_FTRACE is not set | 475 | # CONFIG_FTRACE is not set |
467 | CONFIG_NET_SCHED=y | ||
468 | CONFIG_NET_SCH_FQ_CODEL=y | ||
469 | CONFIG_NET_SCH_FIFO=y | ||
diff --git a/recipes-kernel/linux/linux-fslc/mx25/defconfig b/recipes-kernel/linux/linux-fslc/mx25/defconfig index 2b2d617e..bb70acc6 100644 --- a/recipes-kernel/linux/linux-fslc/mx25/defconfig +++ b/recipes-kernel/linux/linux-fslc/mx25/defconfig | |||
@@ -20,9 +20,9 @@ CONFIG_MACH_MX27ADS=y | |||
20 | CONFIG_MACH_MX27_3DS=y | 20 | CONFIG_MACH_MX27_3DS=y |
21 | CONFIG_MACH_IMX27_VISSTRIM_M10=y | 21 | CONFIG_MACH_IMX27_VISSTRIM_M10=y |
22 | CONFIG_MACH_PCA100=y | 22 | CONFIG_MACH_PCA100=y |
23 | CONFIG_MACH_IMX27_DT=y | ||
24 | CONFIG_SOC_IMX1=y | 23 | CONFIG_SOC_IMX1=y |
25 | CONFIG_SOC_IMX25=y | 24 | CONFIG_SOC_IMX25=y |
25 | CONFIG_SOC_IMX27=y | ||
26 | CONFIG_AEABI=y | 26 | CONFIG_AEABI=y |
27 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 27 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
28 | CONFIG_ZBOOT_ROM_BSS=0x0 | 28 | CONFIG_ZBOOT_ROM_BSS=0x0 |
@@ -32,8 +32,6 @@ CONFIG_KPROBES=y | |||
32 | CONFIG_MODULES=y | 32 | CONFIG_MODULES=y |
33 | CONFIG_MODULE_UNLOAD=y | 33 | CONFIG_MODULE_UNLOAD=y |
34 | # CONFIG_BLK_DEV_BSG is not set | 34 | # CONFIG_BLK_DEV_BSG is not set |
35 | # CONFIG_IOSCHED_DEADLINE is not set | ||
36 | # CONFIG_IOSCHED_CFQ is not set | ||
37 | CONFIG_NET=y | 35 | CONFIG_NET=y |
38 | CONFIG_PACKET=y | 36 | CONFIG_PACKET=y |
39 | CONFIG_UNIX=y | 37 | CONFIG_UNIX=y |
@@ -95,6 +93,7 @@ CONFIG_SPI=y | |||
95 | CONFIG_SPI_IMX=y | 93 | CONFIG_SPI_IMX=y |
96 | CONFIG_SPI_SPIDEV=y | 94 | CONFIG_SPI_SPIDEV=y |
97 | CONFIG_GPIO_SYSFS=y | 95 | CONFIG_GPIO_SYSFS=y |
96 | CONFIG_GPIO_MXC=y | ||
98 | CONFIG_W1=y | 97 | CONFIG_W1=y |
99 | CONFIG_W1_MASTER_MXC=y | 98 | CONFIG_W1_MASTER_MXC=y |
100 | CONFIG_W1_SLAVE_THERM=y | 99 | CONFIG_W1_SLAVE_THERM=y |
@@ -112,7 +111,6 @@ CONFIG_REGULATOR_MC13892=y | |||
112 | CONFIG_MEDIA_SUPPORT=y | 111 | CONFIG_MEDIA_SUPPORT=y |
113 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 112 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
114 | CONFIG_V4L_PLATFORM_DRIVERS=y | 113 | CONFIG_V4L_PLATFORM_DRIVERS=y |
115 | CONFIG_SOC_CAMERA=y | ||
116 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 114 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
117 | CONFIG_VIDEO_CODA=y | 115 | CONFIG_VIDEO_CODA=y |
118 | CONFIG_FB=y | 116 | CONFIG_FB=y |
diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig index 2773899c..a9c6f32a 100644 --- a/recipes-kernel/linux/linux-fslc/mxs/defconfig +++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig | |||
@@ -25,8 +25,6 @@ CONFIG_MODULE_UNLOAD=y | |||
25 | CONFIG_MODULE_FORCE_UNLOAD=y | 25 | CONFIG_MODULE_FORCE_UNLOAD=y |
26 | CONFIG_MODVERSIONS=y | 26 | CONFIG_MODVERSIONS=y |
27 | CONFIG_BLK_DEV_INTEGRITY=y | 27 | CONFIG_BLK_DEV_INTEGRITY=y |
28 | # CONFIG_IOSCHED_DEADLINE is not set | ||
29 | # CONFIG_IOSCHED_CFQ is not set | ||
30 | CONFIG_NET=y | 28 | CONFIG_NET=y |
31 | CONFIG_PACKET=y | 29 | CONFIG_PACKET=y |
32 | CONFIG_UNIX=y | 30 | CONFIG_UNIX=y |
diff --git a/recipes-kernel/linux/linux-fslc_5.4.bb b/recipes-kernel/linux/linux-fslc_5.10.bb index d2851f89..fb73d65b 100644 --- a/recipes-kernel/linux/linux-fslc_5.4.bb +++ b/recipes-kernel/linux/linux-fslc_5.10.bb | |||
@@ -12,16 +12,16 @@ upstreaming." | |||
12 | 12 | ||
13 | include linux-fslc.inc | 13 | include linux-fslc.inc |
14 | 14 | ||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
16 | 16 | ||
17 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 17 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
18 | # required by kernel-yocto.bbclass. | 18 | # required by kernel-yocto.bbclass. |
19 | # | 19 | # |
20 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 20 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
21 | # should be updated once patchlevel is merged. | 21 | # should be updated once patchlevel is merged. |
22 | LINUX_VERSION = "5.4.82" | 22 | LINUX_VERSION = "5.10-rc7" |
23 | 23 | ||
24 | SRCBRANCH = "5.4.x+fslc" | 24 | SRCBRANCH = "5.10.x+fslc" |
25 | SRCREV = "38210f196c3250956c87d501b38b0b88f5cf5177" | 25 | SRCREV = "2b929f3dcf6caa89edb5c37f497b036d8964347f" |
26 | 26 | ||
27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" |