From 02125de2a9b765649a7a71d18c7dbe69404450c8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 15 Mar 2019 17:55:19 -0300 Subject: [PATCH] linux-fslc: Upgrade 4.20 -> 5.0 This upgrades the Linux fork to a 5.0-based one. It forward port the patches which were still included and then has following patches applied: - 20d8efe36350 Revert "ARM: dts: imx7d-pico: Pass the Ethernet PHY reset GPIO" - 69f55e399783 ARM: dts: imx6ul-pico: Convert to DRM bindings - 385073b89f9d ARM: dts: imx7d-pico: Add LCD support - b8e79ca07f93 drm/panel: simple: Add support for VXT VL050-8048NT-C01 panel - 503b228c6dc9 dt-bindings: Add VXT VL050-8048NT-C01 panel bindings - 8c97588def29 dt-bindings: Add vendor prefix for VXT Ltd - 096f800773bd ARM: dts: imx6ul-pico-hobbit: Extend peripherals support - 24aecb0c2ee7 drivers, misc: add U-Boot bootcount driver - 0f9e1f27279b fec: Add disable_giga parameter to force 10/100 operation - 87af09aea2d4 MA-7633-2 [Android-Reboot]reboot to fastboot\recovery mode - e77beaa42b9c ARM: imx: add cpu_is_imx6() routine Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-fslc/defconfig | 9 +++++++++ .../linux/{linux-fslc_4.20.bb => linux-fslc_5.0.bb} | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) rename recipes-kernel/linux/{linux-fslc_4.20.bb => linux-fslc_5.0.bb} (86%) diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 6985d61e..16a7d2e4 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig @@ -38,6 +38,7 @@ CONFIG_SOC_IMX6SLL=y CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX7D=y +CONFIG_SOC_IMX7ULP=y CONFIG_SOC_VF610=y CONFIG_PCI=y CONFIG_PCI_MSI=y @@ -81,6 +82,7 @@ CONFIG_NETFILTER=y CONFIG_CAN=y CONFIG_CAN_FLEXCAN=y CONFIG_BT=y +CONFIG_BT_BNEP=m CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_LL=y CONFIG_CFG80211=y @@ -175,6 +177,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_TOUCHSCREEN_EGALAX=y +CONFIG_TOUCHSCREEN_GOODIX=y CONFIG_TOUCHSCREEN_MAX11801=y CONFIG_TOUCHSCREEN_IMX6UL_TSC=y CONFIG_TOUCHSCREEN_EDT_FT5X06=y @@ -224,10 +227,12 @@ CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y CONFIG_WATCHDOG=y CONFIG_DA9062_WATCHDOG=y +CONFIG_DA9063_WATCHDOG=m CONFIG_RN5T618_WATCHDOG=y CONFIG_IMX2_WDT=y CONFIG_MFD_DA9052_I2C=y CONFIG_MFD_DA9062=y +CONFIG_MFD_DA9063=y CONFIG_MFD_MC13XXX_SPI=y CONFIG_MFD_MC13XXX_I2C=y CONFIG_MFD_RN5T618=y @@ -237,6 +242,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_ANATOP=y CONFIG_REGULATOR_DA9052=y CONFIG_REGULATOR_DA9062=y +CONFIG_REGULATOR_DA9063=y CONFIG_REGULATOR_GPIO=y CONFIG_REGULATOR_MC13783=y CONFIG_REGULATOR_MC13892=y @@ -256,6 +262,7 @@ CONFIG_VIDEO_MUX=y CONFIG_SOC_CAMERA=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_CODA=m +CONFIG_VIDEO_IMX_PXP=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set CONFIG_VIDEO_ADV7180=m CONFIG_VIDEO_OV5640=m @@ -302,6 +309,7 @@ CONFIG_SND_SOC_WM8962=y CONFIG_SND_SIMPLE_CARD=y CONFIG_HID_MULTITOUCH=y CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MXC=y CONFIG_USB_STORAGE=y @@ -429,6 +437,7 @@ CONFIG_NLS_UTF8=y CONFIG_SECURITYFS=y CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_SAHARA=y +CONFIG_CRYPTO_DEV_MXS_DCP=y CONFIG_CRC_CCITT=m CONFIG_CRC_T10DIF=y CONFIG_CRC7=m diff --git a/recipes-kernel/linux/linux-fslc_4.20.bb b/recipes-kernel/linux/linux-fslc_5.0.bb similarity index 86% rename from recipes-kernel/linux/linux-fslc_4.20.bb rename to recipes-kernel/linux/linux-fslc_5.0.bb index d7bf4b7a..b9c7efde 100644 --- a/recipes-kernel/linux/linux-fslc_4.20.bb +++ b/recipes-kernel/linux/linux-fslc_5.0.bb @@ -11,9 +11,9 @@ include linux-fslc.inc LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -PV = "4.20+git${SRCPV}" +PV = "5.0.3+git${SRCPV}" -SRCBRANCH = "4.20.x+fslc" -SRCREV = "bf414f71d71348bf549d320fa6518b04738dbaa1" +SRCBRANCH = "5.0.x+fslc" +SRCREV = "20d8efe363508fc77934cfa69e16cdfcff025ebd" COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" -- 2.40.1