aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/linux/linux-imx-headers-4.9.123/0001-uapi-Install-custom-headers.patch40
-rw-r--r--recipes-kernel/linux/linux-imx-headers_4.14.98.bb (renamed from recipes-kernel/linux/linux-imx-headers_4.9.123.bb)8
2 files changed, 3 insertions, 45 deletions
diff --git a/recipes-kernel/linux/linux-imx-headers-4.9.123/0001-uapi-Install-custom-headers.patch b/recipes-kernel/linux/linux-imx-headers-4.9.123/0001-uapi-Install-custom-headers.patch
deleted file mode 100644
index fd842bf1..00000000
--- a/recipes-kernel/linux/linux-imx-headers-4.9.123/0001-uapi-Install-custom-headers.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 33c85073a35e697e080583ca8edb31400b45de60 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Wed, 3 Oct 2018 18:02:43 -0500
-Subject: [PATCH] uapi: Install custom headers
-
-Upstream-Status: Inappropriate [i.MX specific]
-
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
----
- include/uapi/linux/Kbuild | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: git/include/uapi/linux/Kbuild
-===================================================================
---- git.orig/include/uapi/linux/Kbuild
-+++ git/include/uapi/linux/Kbuild
-@@ -104,6 +104,7 @@ header-y += dlm_device.h
- header-y += dlm.h
- header-y += dlm_netlink.h
- header-y += dlm_plock.h
-+header-y += dma-buf.h
- header-y += dm-ioctl.h
- header-y += dm-log-userspace.h
- header-y += dn.h
-@@ -144,6 +145,7 @@ header-y += gigaset_dev.h
- header-y += gpio.h
- header-y += gsmmux.h
- header-y += gtp.h
-+header-y += hantrodec.h
- header-y += hdlcdrv.h
- header-y += hdlc.h
- header-y += hdreg.h
-@@ -152,6 +154,7 @@ header-y += hid.h
- header-y += hidraw.h
- header-y += hpet.h
- header-y += hsr_netlink.h
-+header-y += hx280enc.h
- header-y += hyperv.h
- header-y += hysdn_if.h
- header-y += i2c-dev.h
diff --git a/recipes-kernel/linux/linux-imx-headers_4.9.123.bb b/recipes-kernel/linux/linux-imx-headers_4.14.98.bb
index 44bce42a..e55a795b 100644
--- a/recipes-kernel/linux/linux-imx-headers_4.9.123.bb
+++ b/recipes-kernel/linux/linux-imx-headers_4.14.98.bb
@@ -7,11 +7,10 @@ New headers are installed in ${includedir}/imx."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-SRCBRANCH = "imx_4.9.123_imx8mm_ga"
+SRCBRANCH = "imx_4.14.98_2.0.0_ga"
LOCALVERSION = "-imx"
-SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \
- file://0001-uapi-Install-custom-headers.patch"
-SRCREV = "6a71cbc089755afd6a86c005c22a1af6eab24a70"
+SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV = "dfc78102d29f81d9316b281a3b8af3dff95174c8"
S = "${WORKDIR}/git"
@@ -32,7 +31,6 @@ IMX_UAPI_HEADERS = " \
mxcfb.h \
pxp_device.h \
pxp_dma.h \
- version.h \
videodev2.h \
"