mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-06-04 18:00:36 +00:00
ti-sgx-ddk-km: bump SRCREV to pick up two local patches
- pickup the latest release which includes two local patches - remove those two local patches Signed-off-by: Eric Ruei <e-ruei1@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
This commit is contained in:
committed by
Denys Dmytriyenko
parent
ef092ad32b
commit
17f4f5d574
-37
@@ -1,37 +0,0 @@
|
|||||||
From 1ee059ed47b379c1cd9494c507a4a1e67dc90cf2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Ruei <e-ruei1@ti.com>
|
|
||||||
Date: Mon, 12 Mar 2018 17:56:50 -0400
|
|
||||||
Subject: [PATCH 1/2] pvr_drm.c: fix undeclared identifier error for AM3/4
|
|
||||||
builds
|
|
||||||
|
|
||||||
The undeclared identifier error was introduced during the k4.14 migration
|
|
||||||
and therefore was not applicable to the k4.4 and k4.9 branches.
|
|
||||||
|
|
||||||
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
|
|
||||||
---
|
|
||||||
eurasia_km/services4/srvkm/env/linux/pvr_drm.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/eurasia_km/services4/srvkm/env/linux/pvr_drm.c b/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
|
|
||||||
index 39ee832..33f6c3d 100644
|
|
||||||
--- a/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
|
|
||||||
+++ b/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
|
|
||||||
@@ -655,12 +655,12 @@ static struct platform_driver sPVRPlatDriver =
|
|
||||||
static int
|
|
||||||
PVRSRVDrmProbe(struct platform_device *pDevice)
|
|
||||||
{
|
|
||||||
-#if (AM_VERSION != 5)
|
|
||||||
- struct gfx_sgx_platform_data *pdata = dev->platform_data;
|
|
||||||
-#endif
|
|
||||||
int ret;
|
|
||||||
struct device *dev = &pDevice->dev;
|
|
||||||
struct drm_device *drm_dev;
|
|
||||||
+#if (AM_VERSION != 5)
|
|
||||||
+ struct gfx_sgx_platform_data *pdata = dev->platform_data;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
PVR_TRACE(("PVRSRVDrmProbe"));
|
|
||||||
|
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
||||||
-26
@@ -1,26 +0,0 @@
|
|||||||
From 621e02869be9958400fd045e1bb0f4f1d81a6918 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Denys Dmytriyenko <denys@ti.com>
|
|
||||||
Date: Fri, 10 Nov 2017 18:55:26 -0500
|
|
||||||
Subject: [PATCH] srvkm/common/devicemem.c: suppress implicit fallthrough error
|
|
||||||
in gcc7
|
|
||||||
|
|
||||||
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
|
|
||||||
---
|
|
||||||
eurasia_km/services4/srvkm/common/devicemem.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/eurasia_km/services4/srvkm/common/devicemem.c b/eurasia_km/services4/srvkm/common/devicemem.c
|
|
||||||
index baf7c41..c083c63 100644
|
|
||||||
--- a/eurasia_km/services4/srvkm/common/devicemem.c
|
|
||||||
+++ b/eurasia_km/services4/srvkm/common/devicemem.c
|
|
||||||
@@ -1071,6 +1071,7 @@ PVRSRV_ERROR FreeMemCallBackCommon(PVRSRV_KERNEL_MEM_INFO *psMemInfo,
|
|
||||||
case PVRSRV_MEMTYPE_ION:
|
|
||||||
case PVRSRV_MEMTYPE_DMABUF:
|
|
||||||
freeExternal(psMemInfo);
|
|
||||||
+ /* FALLTHRU */
|
|
||||||
case PVRSRV_MEMTYPE_DEVICE:
|
|
||||||
case PVRSRV_MEMTYPE_DEVICECLASS:
|
|
||||||
#if defined(SUPPORT_ION)
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
||||||
@@ -22,14 +22,11 @@ RCONFLICTS_${PN} = "omapdrm-pvr"
|
|||||||
|
|
||||||
BRANCH = "ti-img-sgx/${PV}/k4.14"
|
BRANCH = "ti-img-sgx/${PV}/k4.14"
|
||||||
|
|
||||||
SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH} \
|
SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
|
||||||
file://0001-srvkm-common-devicemem.c-suppress-implicit-fallthrou.patch \
|
|
||||||
file://0001-pvr_drm.c-fix-undeclared-identifier-error-for-AM3-4-.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
SRCREV = "855889f437250b6572c75d12696ec4a998b9aef9"
|
SRCREV = "d2b3959738cfcc6209e8e882d1989de790866c8f"
|
||||||
|
|
||||||
TARGET_PRODUCT_omap-a15 = "jacinto6evm"
|
TARGET_PRODUCT_omap-a15 = "jacinto6evm"
|
||||||
TARGET_PRODUCT_ti33x = "ti335x"
|
TARGET_PRODUCT_ti33x = "ti335x"
|
||||||
|
|||||||
Reference in New Issue
Block a user