From 94f4f086c6014cbcfd10bda3540d19558c8bf0b0 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Wed, 19 Feb 2020 15:19:23 -0300 Subject: linux-fslc: Update to use 5.4.x version Update to tag v5.4.20 and sync defconfig files. Signed-off-by: Fabio Berton (cherry picked from commit 66a2169bd2e449856e1eb6891d8383a60365936d) --- recipes-kernel/linux/linux-fslc/defconfig | 15 ++++++++++++++- recipes-kernel/linux/linux-fslc/mx25/defconfig | 3 +-- recipes-kernel/linux/linux-fslc/mxs/defconfig | 3 +-- recipes-kernel/linux/linux-fslc_5.1.bb | 19 ------------------- recipes-kernel/linux/linux-fslc_5.4.bb | 19 +++++++++++++++++++ 5 files changed, 35 insertions(+), 24 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc_5.1.bb create mode 100644 recipes-kernel/linux/linux-fslc_5.4.bb 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 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPUFREQ_DT=y CONFIG_ARM_IMX6Q_CPUFREQ=y +CONFIG_ARM_IMX_CPUFREQ_DT=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_PSCI_CPUIDLE=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_PM_DEBUG=y @@ -110,7 +112,7 @@ CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_DATAFLASH=y CONFIG_MTD_M25P80=y CONFIG_MTD_SST25L=y -CONFIG_MTD_NAND=y +CONFIG_MTD_RAW_NAND=y CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_MTD_NAND_VF610_NFC=y CONFIG_MTD_NAND_MXC=y @@ -210,9 +212,11 @@ CONFIG_SPI_GPIO=y CONFIG_SPI_IMX=y CONFIG_SPI_FSL_DSPI=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_SIOX=m CONFIG_GPIO_MAX732X=y CONFIG_GPIO_MC9S08DZ60=y CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCF857X=y CONFIG_GPIO_STMPE=y CONFIG_GPIO_74X164=y CONFIG_POWER_RESET=y @@ -222,6 +226,7 @@ CONFIG_POWER_SUPPLY=y CONFIG_SENSORS_MC13783_ADC=y CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_IIO_HWMON=y +CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y @@ -265,9 +270,12 @@ CONFIG_VIDEO_CODA=m CONFIG_VIDEO_IMX_PXP=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV5640=m +CONFIG_VIDEO_OV5645=m CONFIG_IMX_IPUV3_CORE=y CONFIG_DRM=y +CONFIG_DRM_MSM=y CONFIG_DRM_PANEL_LVDS=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SEIKO_43WVF1G=y @@ -398,11 +406,15 @@ CONFIG_MPL3115=y CONFIG_PWM=y CONFIG_PWM_FSL_FTM=y CONFIG_PWM_IMX27=y +CONFIG_PWM_IMX_TPM=y CONFIG_NVMEM_IMX_OCOTP=y CONFIG_NVMEM_VF610_OCOTP=y +CONFIG_NVMEM_SNVS_LPGPR=y CONFIG_TEE=y CONFIG_OPTEE=y CONFIG_MUX_MMIO=y +CONFIG_SIOX=m +CONFIG_SIOX_BUS_GPIO=m CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y @@ -447,6 +459,7 @@ CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y # CONFIG_SCHED_DEBUG is not set CONFIG_PROVE_LOCKING=y # 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 # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_IMX_WEIM=y @@ -61,7 +60,7 @@ CONFIG_MTD_CFI_GEOMETRY=y # CONFIG_MTD_CFI_I2 is not set CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_NAND=y +CONFIG_MTD_RAW_NAND=y CONFIG_MTD_NAND_MXC=y CONFIG_MTD_UBI=y CONFIG_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 CONFIG_MTD_DATAFLASH=y CONFIG_MTD_M25P80=y CONFIG_MTD_SST25L=y -CONFIG_MTD_NAND=y +CONFIG_MTD_RAW_NAND=y CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=y @@ -96,7 +96,6 @@ CONFIG_DRM=y CONFIG_DRM_PANEL_SEIKO_43WVF1G=y CONFIG_DRM_MXSFB=y CONFIG_FB_MODE_HELPERS=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y diff --git a/recipes-kernel/linux/linux-fslc_5.1.bb b/recipes-kernel/linux/linux-fslc_5.1.bb deleted file mode 100644 index dceb8337..00000000 --- a/recipes-kernel/linux/linux-fslc_5.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2012-2019 O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes" -DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ -provide support for some backported features and fixes, or because it was applied in linux-next \ -and takes some time to become part of a stable version, or because it is not applicable for \ -upstreaming." - -include linux-fslc.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -PV = "5.1.15+git${SRCPV}" - -SRCBRANCH = "5.1.x+fslc" -SRCREV = "cd1d083333e76e03d16f015c23f1f1b8c8637381" - -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" diff --git a/recipes-kernel/linux/linux-fslc_5.4.bb b/recipes-kernel/linux/linux-fslc_5.4.bb new file mode 100644 index 00000000..c65319ed --- /dev/null +++ b/recipes-kernel/linux/linux-fslc_5.4.bb @@ -0,0 +1,19 @@ +# Copyright (C) 2012-2019 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes" +DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ +provide support for some backported features and fixes, or because it was applied in linux-next \ +and takes some time to become part of a stable version, or because it is not applicable for \ +upstreaming." + +include linux-fslc.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +PV = "5.4.20+git${SRCPV}" + +SRCBRANCH = "5.4.x+fslc" +SRCREV = "18d5e274c7807dd6eafa5cedf1ab528ac364fa55" + +COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" -- cgit v1.2.3-54-g00ecf