summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2020-02-19 15:19:23 -0300
committerFabio Berton <fabio.berton@ossystems.com.br>2020-02-19 16:58:29 -0300
commit66a2169bd2e449856e1eb6891d8383a60365936d (patch)
treee9e15553cae748c200b2b2fbb69cdea22b5ccbff
parent380656c4de55951b787aa6b2c73b3c36cd0fb2e8 (diff)
downloadmeta-freescale-66a2169bd2e449856e1eb6891d8383a60365936d.tar.gz
linux-fslc: Update to use 5.4.x version
Update to tag v5.4.20 and sync defconfig files. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig15
-rw-r--r--recipes-kernel/linux/linux-fslc/mx25/defconfig3
-rw-r--r--recipes-kernel/linux/linux-fslc/mxs/defconfig3
-rw-r--r--recipes-kernel/linux/linux-fslc_5.4.bb (renamed from recipes-kernel/linux/linux-fslc_5.1.bb)6
4 files changed, 19 insertions, 8 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index 7381cafd..dbb2387c 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -57,8 +57,10 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
57CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 57CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
58CONFIG_CPUFREQ_DT=y 58CONFIG_CPUFREQ_DT=y
59CONFIG_ARM_IMX6Q_CPUFREQ=y 59CONFIG_ARM_IMX6Q_CPUFREQ=y
60CONFIG_ARM_IMX_CPUFREQ_DT=y
60CONFIG_CPU_IDLE=y 61CONFIG_CPU_IDLE=y
61CONFIG_ARM_CPUIDLE=y 62CONFIG_ARM_CPUIDLE=y
63CONFIG_ARM_PSCI_CPUIDLE=y
62CONFIG_VFP=y 64CONFIG_VFP=y
63CONFIG_NEON=y 65CONFIG_NEON=y
64CONFIG_PM_DEBUG=y 66CONFIG_PM_DEBUG=y
@@ -110,7 +112,7 @@ CONFIG_MTD_PHYSMAP_OF=y
110CONFIG_MTD_DATAFLASH=y 112CONFIG_MTD_DATAFLASH=y
111CONFIG_MTD_M25P80=y 113CONFIG_MTD_M25P80=y
112CONFIG_MTD_SST25L=y 114CONFIG_MTD_SST25L=y
113CONFIG_MTD_NAND=y 115CONFIG_MTD_RAW_NAND=y
114CONFIG_MTD_NAND_GPMI_NAND=y 116CONFIG_MTD_NAND_GPMI_NAND=y
115CONFIG_MTD_NAND_VF610_NFC=y 117CONFIG_MTD_NAND_VF610_NFC=y
116CONFIG_MTD_NAND_MXC=y 118CONFIG_MTD_NAND_MXC=y
@@ -210,9 +212,11 @@ CONFIG_SPI_GPIO=y
210CONFIG_SPI_IMX=y 212CONFIG_SPI_IMX=y
211CONFIG_SPI_FSL_DSPI=y 213CONFIG_SPI_FSL_DSPI=y
212CONFIG_GPIO_SYSFS=y 214CONFIG_GPIO_SYSFS=y
215CONFIG_GPIO_SIOX=m
213CONFIG_GPIO_MAX732X=y 216CONFIG_GPIO_MAX732X=y
214CONFIG_GPIO_MC9S08DZ60=y 217CONFIG_GPIO_MC9S08DZ60=y
215CONFIG_GPIO_PCA953X=y 218CONFIG_GPIO_PCA953X=y
219CONFIG_GPIO_PCF857X=y
216CONFIG_GPIO_STMPE=y 220CONFIG_GPIO_STMPE=y
217CONFIG_GPIO_74X164=y 221CONFIG_GPIO_74X164=y
218CONFIG_POWER_RESET=y 222CONFIG_POWER_RESET=y
@@ -222,6 +226,7 @@ CONFIG_POWER_SUPPLY=y
222CONFIG_SENSORS_MC13783_ADC=y 226CONFIG_SENSORS_MC13783_ADC=y
223CONFIG_SENSORS_GPIO_FAN=y 227CONFIG_SENSORS_GPIO_FAN=y
224CONFIG_SENSORS_IIO_HWMON=y 228CONFIG_SENSORS_IIO_HWMON=y
229CONFIG_THERMAL_STATISTICS=y
225CONFIG_THERMAL_WRITABLE_TRIPS=y 230CONFIG_THERMAL_WRITABLE_TRIPS=y
226CONFIG_CPU_THERMAL=y 231CONFIG_CPU_THERMAL=y
227CONFIG_IMX_THERMAL=y 232CONFIG_IMX_THERMAL=y
@@ -265,9 +270,12 @@ CONFIG_VIDEO_CODA=m
265CONFIG_VIDEO_IMX_PXP=y 270CONFIG_VIDEO_IMX_PXP=y
266# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set 271# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
267CONFIG_VIDEO_ADV7180=m 272CONFIG_VIDEO_ADV7180=m
273CONFIG_VIDEO_OV2680=m
268CONFIG_VIDEO_OV5640=m 274CONFIG_VIDEO_OV5640=m
275CONFIG_VIDEO_OV5645=m
269CONFIG_IMX_IPUV3_CORE=y 276CONFIG_IMX_IPUV3_CORE=y
270CONFIG_DRM=y 277CONFIG_DRM=y
278CONFIG_DRM_MSM=y
271CONFIG_DRM_PANEL_LVDS=y 279CONFIG_DRM_PANEL_LVDS=y
272CONFIG_DRM_PANEL_SIMPLE=y 280CONFIG_DRM_PANEL_SIMPLE=y
273CONFIG_DRM_PANEL_SEIKO_43WVF1G=y 281CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
@@ -398,11 +406,15 @@ CONFIG_MPL3115=y
398CONFIG_PWM=y 406CONFIG_PWM=y
399CONFIG_PWM_FSL_FTM=y 407CONFIG_PWM_FSL_FTM=y
400CONFIG_PWM_IMX27=y 408CONFIG_PWM_IMX27=y
409CONFIG_PWM_IMX_TPM=y
401CONFIG_NVMEM_IMX_OCOTP=y 410CONFIG_NVMEM_IMX_OCOTP=y
402CONFIG_NVMEM_VF610_OCOTP=y 411CONFIG_NVMEM_VF610_OCOTP=y
412CONFIG_NVMEM_SNVS_LPGPR=y
403CONFIG_TEE=y 413CONFIG_TEE=y
404CONFIG_OPTEE=y 414CONFIG_OPTEE=y
405CONFIG_MUX_MMIO=y 415CONFIG_MUX_MMIO=y
416CONFIG_SIOX=m
417CONFIG_SIOX_BUS_GPIO=m
406CONFIG_EXT2_FS=y 418CONFIG_EXT2_FS=y
407CONFIG_EXT2_FS_XATTR=y 419CONFIG_EXT2_FS_XATTR=y
408CONFIG_EXT2_FS_POSIX_ACL=y 420CONFIG_EXT2_FS_POSIX_ACL=y
@@ -447,6 +459,7 @@ CONFIG_FONT_8x8=y
447CONFIG_FONT_8x16=y 459CONFIG_FONT_8x16=y
448CONFIG_PRINTK_TIME=y 460CONFIG_PRINTK_TIME=y
449CONFIG_MAGIC_SYSRQ=y 461CONFIG_MAGIC_SYSRQ=y
462CONFIG_DEBUG_FS=y
450# CONFIG_SCHED_DEBUG is not set 463# CONFIG_SCHED_DEBUG is not set
451CONFIG_PROVE_LOCKING=y 464CONFIG_PROVE_LOCKING=y
452# CONFIG_DEBUG_BUGVERBOSE is not set 465# CONFIG_DEBUG_BUGVERBOSE is not set
diff --git a/recipes-kernel/linux/linux-fslc/mx25/defconfig b/recipes-kernel/linux/linux-fslc/mx25/defconfig
index b37f8e67..2b2d617e 100644
--- a/recipes-kernel/linux/linux-fslc/mx25/defconfig
+++ b/recipes-kernel/linux/linux-fslc/mx25/defconfig
@@ -47,7 +47,6 @@ CONFIG_IP_PNP_DHCP=y
47# CONFIG_INET_DIAG is not set 47# CONFIG_INET_DIAG is not set
48# CONFIG_IPV6 is not set 48# CONFIG_IPV6 is not set
49CONFIG_NETFILTER=y 49CONFIG_NETFILTER=y
50CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
51CONFIG_DEVTMPFS=y 50CONFIG_DEVTMPFS=y
52CONFIG_DEVTMPFS_MOUNT=y 51CONFIG_DEVTMPFS_MOUNT=y
53CONFIG_IMX_WEIM=y 52CONFIG_IMX_WEIM=y
@@ -61,7 +60,7 @@ CONFIG_MTD_CFI_GEOMETRY=y
61# CONFIG_MTD_CFI_I2 is not set 60# CONFIG_MTD_CFI_I2 is not set
62CONFIG_MTD_CFI_INTELEXT=y 61CONFIG_MTD_CFI_INTELEXT=y
63CONFIG_MTD_PHYSMAP=y 62CONFIG_MTD_PHYSMAP=y
64CONFIG_MTD_NAND=y 63CONFIG_MTD_RAW_NAND=y
65CONFIG_MTD_NAND_MXC=y 64CONFIG_MTD_NAND_MXC=y
66CONFIG_MTD_UBI=y 65CONFIG_MTD_UBI=y
67CONFIG_EEPROM_AT24=y 66CONFIG_EEPROM_AT24=y
diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig
index 38480596..2773899c 100644
--- a/recipes-kernel/linux/linux-fslc/mxs/defconfig
+++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig
@@ -50,7 +50,7 @@ CONFIG_MTD_BLOCK=y
50CONFIG_MTD_DATAFLASH=y 50CONFIG_MTD_DATAFLASH=y
51CONFIG_MTD_M25P80=y 51CONFIG_MTD_M25P80=y
52CONFIG_MTD_SST25L=y 52CONFIG_MTD_SST25L=y
53CONFIG_MTD_NAND=y 53CONFIG_MTD_RAW_NAND=y
54CONFIG_MTD_NAND_GPMI_NAND=y 54CONFIG_MTD_NAND_GPMI_NAND=y
55CONFIG_MTD_SPI_NOR=y 55CONFIG_MTD_SPI_NOR=y
56CONFIG_MTD_UBI=y 56CONFIG_MTD_UBI=y
@@ -96,7 +96,6 @@ CONFIG_DRM=y
96CONFIG_DRM_PANEL_SEIKO_43WVF1G=y 96CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
97CONFIG_DRM_MXSFB=y 97CONFIG_DRM_MXSFB=y
98CONFIG_FB_MODE_HELPERS=y 98CONFIG_FB_MODE_HELPERS=y
99CONFIG_BACKLIGHT_LCD_SUPPORT=y
100CONFIG_LCD_CLASS_DEVICE=y 99CONFIG_LCD_CLASS_DEVICE=y
101CONFIG_BACKLIGHT_CLASS_DEVICE=y 100CONFIG_BACKLIGHT_CLASS_DEVICE=y
102CONFIG_BACKLIGHT_PWM=y 101CONFIG_BACKLIGHT_PWM=y
diff --git a/recipes-kernel/linux/linux-fslc_5.1.bb b/recipes-kernel/linux/linux-fslc_5.4.bb
index dceb8337..c65319ed 100644
--- a/recipes-kernel/linux/linux-fslc_5.1.bb
+++ b/recipes-kernel/linux/linux-fslc_5.4.bb
@@ -11,9 +11,9 @@ include linux-fslc.inc
11 11
12LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" 12LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
13 13
14PV = "5.1.15+git${SRCPV}" 14PV = "5.4.20+git${SRCPV}"
15 15
16SRCBRANCH = "5.1.x+fslc" 16SRCBRANCH = "5.4.x+fslc"
17SRCREV = "cd1d083333e76e03d16f015c23f1f1b8c8637381" 17SRCREV = "18d5e274c7807dd6eafa5cedf1ab528ac364fa55"
18 18
19COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" 19COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"