From 7d536efb5d0875877004de1d84c04dc6a2f92e50 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 28 Nov 2018 19:17:14 -0200 Subject: linux-fslc: Upgrade to 4.19-based fork This upgrades the Linux FSLC to a 4.19-based fork. It is currently based on 4.19.5 stable release. Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-fslc/defconfig | 10 ++++++---- recipes-kernel/linux/linux-fslc/mx25/defconfig | 2 ++ recipes-kernel/linux/linux-fslc/mxs/defconfig | 6 ++++-- recipes-kernel/linux/linux-fslc_4.18.bb | 19 ------------------- recipes-kernel/linux/linux-fslc_4.19.bb | 19 +++++++++++++++++++ 5 files changed, 31 insertions(+), 25 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc_4.18.bb create mode 100644 recipes-kernel/linux/linux-fslc_4.19.bb diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 26ac71639..8af76b499 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig @@ -83,7 +83,6 @@ CONFIG_CAN=y CONFIG_CAN_FLEXCAN=y CONFIG_BT=y CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_LL=y CONFIG_BT_BNEP=m CONFIG_CFG80211=y @@ -262,6 +261,7 @@ CONFIG_IMX_IPUV3_CORE=y CONFIG_DRM=y CONFIG_DRM_PANEL_LVDS=y CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_PANEL_SEIKO_43WVF1G=y CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_CEC=y CONFIG_DRM_IMX=y @@ -270,7 +270,8 @@ CONFIG_DRM_IMX_TVE=y CONFIG_DRM_IMX_LDB=y CONFIG_DRM_IMX_HDMI=y CONFIG_DRM_ETNAVIV=y -CONFIG_FB_MXS=y +CONFIG_DRM_MXSFB=y +CONFIG_FB_MODE_HELPERS=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_L4F00242T03=y CONFIG_LCD_PLATFORM=y @@ -286,7 +287,6 @@ CONFIG_SND_SOC_FSL_ASRC=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_PHYCORE_AC97=y CONFIG_SND_SOC_EUKREA_TLV320=y -CONFIG_SND_SOC_IMX_WM8962=y CONFIG_SND_SOC_IMX_ES8328=y CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_SPDIF=y @@ -374,13 +374,16 @@ CONFIG_DMADEVICES=y CONFIG_FSL_EDMA=y CONFIG_IMX_SDMA=y CONFIG_MXS_DMA=y +CONFIG_DMATEST=m CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_IMX_MEDIA=y CONFIG_COMMON_CLK_PWM=y CONFIG_IIO=y +CONFIG_MMA8452=y CONFIG_IMX7D_ADC=y CONFIG_VF610_ADC=y +CONFIG_SENSORS_ISL29018=y CONFIG_MAG3110=y CONFIG_MPL3115=y CONFIG_PWM=y @@ -409,7 +412,6 @@ CONFIG_ZISOFS=y CONFIG_UDF_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y -CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_JFFS2_FS=y CONFIG_UBIFS_FS=y diff --git a/recipes-kernel/linux/linux-fslc/mx25/defconfig b/recipes-kernel/linux/linux-fslc/mx25/defconfig index 054591dc9..4cd2f4a2b 100644 --- a/recipes-kernel/linux/linux-fslc/mx25/defconfig +++ b/recipes-kernel/linux/linux-fslc/mx25/defconfig @@ -141,9 +141,11 @@ CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_ULPI=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_GADGET=y CONFIG_USB_ETH=m +CONFIG_USB_ULPI_BUS=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y diff --git a/recipes-kernel/linux/linux-fslc/mxs/defconfig b/recipes-kernel/linux/linux-fslc/mxs/defconfig index a508eb302..7b8212857 100644 --- a/recipes-kernel/linux/linux-fslc/mxs/defconfig +++ b/recipes-kernel/linux/linux-fslc/mxs/defconfig @@ -94,8 +94,10 @@ CONFIG_STMP3XXX_RTC_WATCHDOG=y CONFIG_MFD_MXS_LRADC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_FB=y -CONFIG_FB_MXS=y +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 diff --git a/recipes-kernel/linux/linux-fslc_4.18.bb b/recipes-kernel/linux/linux-fslc_4.18.bb deleted file mode 100644 index e602671d0..000000000 --- a/recipes-kernel/linux/linux-fslc_4.18.bb +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2012-2017 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 = "4.18+git${SRCPV}" - -SRCBRANCH = "4.18.x+fslc" -SRCREV = "9c4e93aa83ce1274279c54e557312d431ff91654" - -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" diff --git a/recipes-kernel/linux/linux-fslc_4.19.bb b/recipes-kernel/linux/linux-fslc_4.19.bb new file mode 100644 index 000000000..ce534cfde --- /dev/null +++ b/recipes-kernel/linux/linux-fslc_4.19.bb @@ -0,0 +1,19 @@ +# Copyright (C) 2012-2017 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 = "4.19+git${SRCPV}" + +SRCBRANCH = "4.19.x+fslc" +SRCREV = "298f0b80c9e6d777d8f70069b9d7e88262855693" + +COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" -- cgit v1.2.3-54-g00ecf