From 56829b6d643fa5dfdac42c0adddf5d41e7fb982e Mon Sep 17 00:00:00 2001
From: Dominik Sliwa <dominik.sliwa@toradex.com>
Date: Tue, 19 Mar 2019 16:38:34 +0100
Subject: backports: update backports

Backports based on 4.19 kernel.

Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
---
 recipes-kernel/backports/backports_4.18.bb | 40 --------------
 recipes-kernel/backports/backports_4.19.bb | 40 ++++++++++++++
 recipes-kernel/backports/files/config      | 86 ++++++++++++------------------
 3 files changed, 74 insertions(+), 92 deletions(-)
 delete mode 100644 recipes-kernel/backports/backports_4.18.bb
 create mode 100644 recipes-kernel/backports/backports_4.19.bb

diff --git a/recipes-kernel/backports/backports_4.18.bb b/recipes-kernel/backports/backports_4.18.bb
deleted file mode 100644
index ea595be..0000000
--- a/recipes-kernel/backports/backports_4.18.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Backported kernel drivers"
-HOMEPAGE = "https://backports.wiki.kernel.org"
-SECTION = "kernel/modules"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-INC_PR = "r1"
-
-DEPENDS_append = " coreutils-native"
-
-SRCREV = "5e68b9c311afd867e92f0d71b1121d677698bba1"
-SRCREV_use-head-next = "${AUTOREV}"
-SRC_URI = " \
-    git://git.toradex.com/backports-toradex.git;protocol=git;branch=toradex-${PV} \
-    file://makefile.patch \
-    file://config \
-    "
-
-S = "${WORKDIR}/git"
-
-inherit module
-
-MAKE_TARGETS = "modules"
-MODULES_INSTALL_TARGET = "modules_install"
-PACKAGES_DYNAMIC += "^${BPN}-kernel-module-.*"
-
-KERNEL_MODULE_PACKAGE_PREFIX = "${BPN}-"
-
-EXTRA_OEMAKE = " KLIB=${STAGING_KERNEL_DIR} KLIB_BUILD=${STAGING_KERNEL_BUILDDIR} "
-
-do_configure() {
-
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    make CC="${BUILD_CC}" LD="${BUILD_LD}" AR="${BUILD_AR}" \
-         -C ${S}/kconf  O=${S}/kconf conf
-
-    cp ${WORKDIR}/config ${S}/.config
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake oldconfig
-}
-
diff --git a/recipes-kernel/backports/backports_4.19.bb b/recipes-kernel/backports/backports_4.19.bb
new file mode 100644
index 0000000..43b77af
--- /dev/null
+++ b/recipes-kernel/backports/backports_4.19.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Backported kernel drivers"
+HOMEPAGE = "https://backports.wiki.kernel.org"
+SECTION = "kernel/modules"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+INC_PR = "r1"
+
+DEPENDS_append = " coreutils-native"
+
+SRCREV = "348fa3f6871f56a37dcd16c99ca98118c6d79a38"
+SRCREV_use-head-next = "${AUTOREV}"
+SRC_URI = " \
+    git://git.toradex.com/backports-toradex.git;protocol=git;branch=toradex-${PV} \
+    file://makefile.patch \
+    file://config \
+    "
+
+S = "${WORKDIR}/git"
+
+inherit module
+
+MAKE_TARGETS = "modules"
+MODULES_INSTALL_TARGET = "modules_install"
+PACKAGES_DYNAMIC += "^${BPN}-kernel-module-.*"
+
+KERNEL_MODULE_PACKAGE_PREFIX = "${BPN}-"
+
+EXTRA_OEMAKE = " KLIB=${STAGING_KERNEL_DIR} KLIB_BUILD=${STAGING_KERNEL_BUILDDIR} "
+
+do_configure() {
+
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    make CC="${BUILD_CC}" LD="${BUILD_LD}" AR="${BUILD_AR}" \
+         -C ${S}/kconf  O=${S}/kconf conf
+
+    cp ${WORKDIR}/config ${S}/.config
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    oe_runmake oldconfig
+}
+
diff --git a/recipes-kernel/backports/files/config b/recipes-kernel/backports/files/config
index 0c99cd8..4fee2cd 100644
--- a/recipes-kernel/backports/files/config
+++ b/recipes-kernel/backports/files/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Backports from "Linux" "v4.18-0-g94710cac0ef4" (backports "v4.14-rc2-1-80-g0795d050")
+# Backports from "Linux" "v4.19.24-0-gf287634fe321" (backports "v5.0-rc6-1-7-g31842b41")
 #
 CPTCFG_WIRELESS=y
 CPTCFG_NET_CORE=y
@@ -13,7 +13,6 @@ CPTCFG_BPAUTO_LEDS_TRIGGERS=y
 CPTCFG_BPAUTO_WANT_DEV_COREDUMP=y
 CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP=y
 CPTCFG_BPAUTO_REFCOUNT=y
-CPTCFG_BPAUTO_IOV_ITER=y
 CPTCFG_BPAUTO_SYSTEM_DATA_VERIFICATION=y
 CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION=y
 CPTCFG_BPAUTO_PUBLIC_KEY=y
@@ -88,6 +87,7 @@ CPTCFG_BT_HCIUART_MRVL=y
 CPTCFG_BT_MRVL=m
 CPTCFG_BT_MRVL_SDIO=m
 CPTCFG_BT_ATH3K=m
+# CPTCFG_BT_MTKUART is not set
 CPTCFG_WLAN=y
 # CPTCFG_WIRELESS_WDS is not set
 # CPTCFG_WLAN_VENDOR_ADMTEK is not set
@@ -158,7 +158,12 @@ CPTCFG_MWIFIEX_USB=m
 CPTCFG_WLAN_VENDOR_MEDIATEK=y
 CPTCFG_MT7601U=m
 CPTCFG_MT76_CORE=m
+CPTCFG_MT76_LEDS=y
+CPTCFG_MT76_USB=m
+CPTCFG_MT76x2_COMMON=m
+CPTCFG_MT76x0U=m
 CPTCFG_MT76x2E=m
+CPTCFG_MT76x2U=m
 CPTCFG_WLAN_VENDOR_RALINK=y
 CPTCFG_RT2X00=m
 CPTCFG_RT2500USB=m
@@ -186,7 +191,6 @@ CPTCFG_RSI_91X=m
 # CPTCFG_RSI_DEBUGFS is not set
 CPTCFG_RSI_SDIO=m
 CPTCFG_RSI_USB=m
-# CPTCFG_RSI_COEX is not set
 # CPTCFG_WLAN_VENDOR_ST is not set
 # CPTCFG_WLAN_VENDOR_TI is not set
 # CPTCFG_WLAN_VENDOR_ZYDAS is not set
@@ -195,12 +199,11 @@ CPTCFG_WLAN_VENDOR_QUANTENNA=y
 # CPTCFG_MAC80211_HWSIM is not set
 # CPTCFG_USB_NET_RNDIS_WLAN is not set
 # CPTCFG_USB_NET_DRIVERS is not set
-CPTCFG_SERIAL_DEV_BUS=m
 CPTCFG_SSB_POSSIBLE=y
 # CPTCFG_SSB is not set
 CPTCFG_BCMA_POSSIBLE=y
 # CPTCFG_BCMA is not set
-# CPTCFG_NFC is not set
+CPTCFG_SERIAL_DEV_BUS=m
 
 #
 # USB Device Class drivers
@@ -408,6 +411,8 @@ CPTCFG_CPU_CP15_MMU=y
 CPTCFG_ARM_THUMB=y
 CPTCFG_ARM_VIRT_EXT=y
 CPTCFG_SWP_EMULATE=y
+CPTCFG_CPU_SPECTRE=y
+CPTCFG_HARDEN_BRANCH_PREDICTOR=y
 CPTCFG_KUSER_HELPERS=y
 CPTCFG_OUTER_CACHE=y
 CPTCFG_OUTER_CACHE_SYNC=y
@@ -541,6 +546,11 @@ CPTCFG_NET_PTP_CLASSIFY=y
 CPTCFG_NETFILTER=y
 CPTCFG_NETFILTER_ADVANCED=y
 CPTCFG_NETFILTER_INGRESS=y
+CPTCFG_NETFILTER_XTABLES=y
+CPTCFG_IP_NF_IPTABLES=y
+CPTCFG_IP_NF_FILTER=y
+CPTCFG_IP6_NF_IPTABLES=y
+CPTCFG_IP6_NF_FILTER=y
 CPTCFG_HAVE_NET_DSA=y
 CPTCFG_DNS_RESOLVER=y
 CPTCFG_RPS=y
@@ -703,6 +713,7 @@ CPTCFG_TOUCHSCREEN_CT36X_WLD=y
 CPTCFG_TOUCHSCREEN_ATMEL_MXT=m
 CPTCFG_TOUCHSCREEN_FUSION_F0710A=m
 CPTCFG_TOUCHSCREEN_STMPE=y
+CPTCFG_TOUCHSCREEN_SYNAPTICS_DSX=y
 CPTCFG_INPUT_MISC=y
 CPTCFG_INPUT_UINPUT=y
 CPTCFG_SERIO=y
@@ -748,6 +759,7 @@ CPTCFG_PINCTRL=y
 CPTCFG_PINMUX=y
 CPTCFG_PINCONF=y
 CPTCFG_PINCTRL_IMX=y
+CPTCFG_PINCTRL_IMX_MEMMAP=y
 CPTCFG_PINCTRL_IMX6Q=y
 CPTCFG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CPTCFG_GPIOLIB=y
@@ -797,6 +809,8 @@ CPTCFG_V4L_PLATFORM_DRIVERS=y
 CPTCFG_VIDEO_MXC_OUTPUT=y
 CPTCFG_VIDEO_MXC_CAPTURE=m
 CPTCFG_VIDEO_V4L2_MXC_INT_DEVICE=m
+CPTCFG_VIDEO_MXC_CSI_CAMERA=m
+CPTCFG_MXC_VADC=m
 CPTCFG_VIDEO_MXC_IPU_CAMERA=y
 CPTCFG_MXC_CAMERA_OV5640=m
 CPTCFG_MXC_CAMERA_OV5642=m
@@ -809,8 +823,6 @@ CPTCFG_MXC_IPU_PRP_ENC=m
 CPTCFG_MXC_IPU_CSI_ENC=m
 CPTCFG_VIDEO_MXC_IPU_OUTPUT=y
 CPTCFG_VIDEO_MXC_PXP_V4L2=y
-CPTCFG_VIDEO_MXC_CSI_CAMERA=m
-CPTCFG_MXC_VADC=m
 CPTCFG_SOC_CAMERA=y
 CPTCFG_VGA_ARB=y
 CPTCFG_DRM=y
@@ -833,6 +845,7 @@ CPTCFG_FB_DEFERRED_IO=y
 CPTCFG_FB_MODE_HELPERS=y
 CPTCFG_FB_MXS=y
 CPTCFG_FB_MXC=y
+CPTCFG_FB_MXC_DISP_FRAMEWORK=y
 CPTCFG_FB_MXC_SYNC_PANEL=y
 CPTCFG_FB_MXC_MIPI_DSI=y
 CPTCFG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
@@ -880,6 +893,7 @@ CPTCFG_SND_SOC=y
 CPTCFG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CPTCFG_SND_SOC_FSL_SSI=y
 CPTCFG_SND_SOC_FSL_SPDIF=y
+CPTCFG_SND_SOC_FSL_DMA_WORKAROUND=y
 CPTCFG_SND_SOC_FSL_HDMI=y
 CPTCFG_SND_SOC_IMX_PCM_DMA=y
 CPTCFG_SND_SOC_IMX_AUDMUX=y
@@ -960,18 +974,18 @@ CPTCFG_MMC=y
 CPTCFG_PWRSEQ_EMMC=y
 CPTCFG_PWRSEQ_SIMPLE=y
 CPTCFG_MMC_BLOCK=y
-CPTCFG_MMC_BLOCK_BOUNCE=y
 CPTCFG_MMC_SDHCI=y
 CPTCFG_MMC_SDHCI_IO_ACCESSORS=y
 CPTCFG_MMC_SDHCI_PLTFM=y
 CPTCFG_MMC_SDHCI_ESDHC_IMX=y
+CPTCFG_MMC_CQHCI=y
+CPTCFG_MXC_GPU_VIV=y
 CPTCFG_MXC_IPU=y
-CPTCFG_MXC_MLB=y
-CPTCFG_MXC_MLB150=y
 CPTCFG_MXC_IPU_V3=y
-CPTCFG_MXC_GPU_VIV=y
 CPTCFG_MXC_MIPI_CSI2=y
 CPTCFG_MXC_VPU=y
+CPTCFG_MXC_MLB=y
+CPTCFG_MXC_MLB150=y
 CPTCFG_NEW_LEDS=y
 CPTCFG_LEDS_CLASS=y
 CPTCFG_LEDS_GPIO=y
@@ -1372,7 +1386,6 @@ CPTCFG_BACKPORTED_BPAUTO_NEW_LEDS=y
 CPTCFG_BACKPORTED_BPAUTO_LEDS_CLASS=y
 CPTCFG_BACKPORTED_BPAUTO_LEDS_TRIGGERS=y
 # CPTCFG_BACKPORTED_BPAUTO_USERSEL_BUILD_ALL is not set
-# CPTCFG_BACKPORTED_BPAUTO_CRYPTO_SKCIPHER is not set
 CPTCFG_BACKPORTED_BPAUTO_WANT_DEV_COREDUMP=y
 CPTCFG_BACKPORTED_BPAUTO_BUILD_WANT_DEV_COREDUMP=y
 # CPTCFG_BACKPORTED_BPAUTO_RHASHTABLE is not set
@@ -1471,6 +1484,7 @@ CPTCFG_BACKPORTED_BT_HCIUART_ATH3K=y
 CPTCFG_BACKPORTED_BT_HCIUART_3WIRE=y
 CPTCFG_BACKPORTED_BT_HCIUART_INTEL=y
 # CPTCFG_BACKPORTED_BT_HCIUART_BCM is not set
+# CPTCFG_BACKPORTED_BT_HCIUART_RTL is not set
 CPTCFG_BACKPORTED_BT_HCIUART_QCA=y
 CPTCFG_BACKPORTED_BT_HCIUART_AG6XX=y
 CPTCFG_BACKPORTED_BT_HCIUART_MRVL=y
@@ -1485,6 +1499,7 @@ CPTCFG_BACKPORTED_BT_MRVL=m
 CPTCFG_BACKPORTED_BT_MRVL_SDIO=m
 CPTCFG_BACKPORTED_BT_ATH3K=m
 # CPTCFG_BACKPORTED_BT_WILINK is not set
+# CPTCFG_BACKPORTED_BT_MTKUART is not set
 # CPTCFG_BACKPORTED_BT_QCOMSMD is not set
 # CPTCFG_BACKPORTED_BT_HCIRSI is not set
 CPTCFG_BACKPORTED_WLAN=y
@@ -1679,7 +1694,12 @@ CPTCFG_BACKPORTED_MWIFIEX_USB=m
 CPTCFG_BACKPORTED_WLAN_VENDOR_MEDIATEK=y
 CPTCFG_BACKPORTED_MT7601U=m
 CPTCFG_BACKPORTED_MT76_CORE=m
+CPTCFG_BACKPORTED_MT76_LEDS=y
+CPTCFG_BACKPORTED_MT76_USB=m
+CPTCFG_BACKPORTED_MT76x2_COMMON=m
+CPTCFG_BACKPORTED_MT76x0U=m
 CPTCFG_BACKPORTED_MT76x2E=m
+CPTCFG_BACKPORTED_MT76x2U=m
 CPTCFG_BACKPORTED_WLAN_VENDOR_RALINK=y
 CPTCFG_BACKPORTED_RT2X00=m
 # CPTCFG_BACKPORTED_RT2400PCI is not set
@@ -1818,8 +1838,6 @@ CPTCFG_BACKPORTED_SSB_POSSIBLE=y
 # CPTCFG_BACKPORTED_SSB_SDIOHOST_POSSIBLE is not set
 # CPTCFG_BACKPORTED_SSB_SDIOHOST is not set
 # CPTCFG_BACKPORTED_SSB_HOST_SOC is not set
-# CPTCFG_BACKPORTED_SSB_SILENT is not set
-# CPTCFG_BACKPORTED_SSB_DEBUG is not set
 # CPTCFG_BACKPORTED_SSB_SERIAL is not set
 # CPTCFG_BACKPORTED_SSB_DRIVER_PCICORE_POSSIBLE is not set
 # CPTCFG_BACKPORTED_SSB_DRIVER_PCICORE is not set
@@ -1845,43 +1863,8 @@ CPTCFG_BACKPORTED_BCMA_POSSIBLE=y
 # CPTCFG_BACKPORTED_BCMA_DRIVER_GMAC_CMN is not set
 # CPTCFG_BACKPORTED_BCMA_DRIVER_GPIO is not set
 # CPTCFG_BACKPORTED_BCMA_DEBUG is not set
-# CPTCFG_BACKPORTED_NFC is not set
-# CPTCFG_BACKPORTED_NFC_DIGITAL is not set
-# CPTCFG_BACKPORTED_NFC_NCI is not set
-# CPTCFG_BACKPORTED_NFC_NCI_SPI is not set
-# CPTCFG_BACKPORTED_NFC_NCI_UART is not set
-# CPTCFG_BACKPORTED_NFC_HCI is not set
-# CPTCFG_BACKPORTED_NFC_SHDLC is not set
-# CPTCFG_BACKPORTED_NFC_TRF7970A is not set
-# CPTCFG_BACKPORTED_NFC_MEI_PHY is not set
-# CPTCFG_BACKPORTED_NFC_SIM is not set
-# CPTCFG_BACKPORTED_NFC_PORT100 is not set
-# CPTCFG_BACKPORTED_NFC_FDP is not set
-# CPTCFG_BACKPORTED_NFC_FDP_I2C is not set
-# CPTCFG_BACKPORTED_NFC_PN544 is not set
-# CPTCFG_BACKPORTED_NFC_PN544_I2C is not set
-# CPTCFG_BACKPORTED_NFC_PN544_MEI is not set
-# CPTCFG_BACKPORTED_NFC_PN533 is not set
-# CPTCFG_BACKPORTED_NFC_PN533_USB is not set
-# CPTCFG_BACKPORTED_NFC_PN533_I2C is not set
-# CPTCFG_BACKPORTED_NFC_MICROREAD is not set
-# CPTCFG_BACKPORTED_NFC_MICROREAD_I2C is not set
-# CPTCFG_BACKPORTED_NFC_MICROREAD_MEI is not set
-# CPTCFG_BACKPORTED_NFC_MRVL is not set
-# CPTCFG_BACKPORTED_NFC_MRVL_USB is not set
-# CPTCFG_BACKPORTED_NFC_MRVL_UART is not set
-# CPTCFG_BACKPORTED_NFC_MRVL_I2C is not set
-# CPTCFG_BACKPORTED_NFC_MRVL_SPI is not set
-# CPTCFG_BACKPORTED_NFC_ST21NFCA is not set
-# CPTCFG_BACKPORTED_NFC_ST21NFCA_I2C is not set
-# CPTCFG_BACKPORTED_NFC_ST_NCI is not set
-# CPTCFG_BACKPORTED_NFC_ST_NCI_I2C is not set
-# CPTCFG_BACKPORTED_NFC_ST_NCI_SPI is not set
-# CPTCFG_BACKPORTED_NFC_NXP_NCI is not set
-# CPTCFG_BACKPORTED_NFC_NXP_NCI_I2C is not set
-# CPTCFG_BACKPORTED_NFC_S3FWRN5 is not set
-# CPTCFG_BACKPORTED_NFC_S3FWRN5_I2C is not set
-# CPTCFG_BACKPORTED_NFC_ST95HF is not set
+CPTCFG_BACKPORTED_SERIAL_DEV_BUS=m
+# CPTCFG_BACKPORTED_SERIAL_DEV_CTRL_TTYPORT is not set
 # CPTCFG_BACKPORTED_USB_ACM is not set
 # CPTCFG_BACKPORTED_USB_PRINTER is not set
 # CPTCFG_BACKPORTED_USB_WDM is not set
@@ -1892,4 +1875,3 @@ CPTCFG_BACKPORTED_STAGING=y
 # CPTCFG_BACKPORTED_88EU_AP_MODE is not set
 # CPTCFG_BACKPORTED_R8822BE is not set
 # CPTCFG_BACKPORTED_RTLWIFI_DEBUG_ST is not set
-CPTCFG_BACKPORTED_SERIAL_DEV_BUS=m
-- 
cgit v1.2.3