From b122c644697a98a090c25d6cd6a0e541a2cc036f Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 21 Jun 2013 14:50:15 -0400 Subject: omap3-sgx-modules: remove unnecessary patches for x11, cleanup old patch Signed-off-by: Denys Dmytriyenko --- .../Compile-fixes-for-38-kernel.patch | 346 --------------------- .../omap3-sgx-modules-x11/kernel-30.patch | 38 --- .../omap3-sgx-modules/kernel-30.patch | 76 ++--- 3 files changed, 38 insertions(+), 422 deletions(-) delete mode 100644 recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch delete mode 100644 recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch deleted file mode 100644 index fc315bce..00000000 --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch +++ /dev/null @@ -1,346 +0,0 @@ ---- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c-orig 2011-03-08 04:27:35.000000000 -0800 -+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c 2011-03-17 13:11:31.000000000 -0700 -@@ -235,9 +235,20 @@ static OMAP_ERROR UnblankDisplay(OMAPLFB - { - int res; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) -+ console_lock(); -+#else - acquire_console_sem(); -+#endif -+ - res = fb_blank(psDevInfo->psLINFBInfo, 0); -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) -+ console_unlock(); -+#else - release_console_sem(); -+#endif -+ - #if !defined (CONFIG_OMAP2_DSS) - if (res != 0 && res != -EINVAL) - { -@@ -1118,7 +1129,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF - OMAP_ERROR eError = OMAP_ERROR_GENERIC; - unsigned long FBSize; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) -+ console_lock(); -+#else - acquire_console_sem(); -+#endif - - if (fb_idx < 0 || fb_idx >= num_registered_fb) - { -@@ -1254,7 +1269,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF - errModPut: - module_put(psLINFBOwner); - errRelSem: -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) -+ console_unlock(); -+#else - release_console_sem(); -+#endif - return eError; - } - -@@ -1263,7 +1282,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p - struct fb_info *psLINFBInfo = psDevInfo->psLINFBInfo; - struct module *psLINFBOwner; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) -+ console_lock(); -+#else - acquire_console_sem(); -+#endif - - psLINFBOwner = psLINFBInfo->fbops->owner; - -@@ -1274,7 +1297,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p - - module_put(psLINFBOwner); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) -+ console_unlock(); -+#else - release_console_sem(); -+#endif - } - - OMAP_ERROR OMAPLFBInit(void) ---- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig 2011-03-08 04:27:35.000000000 -0800 -+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c 2011-03-17 13:40:15.000000000 -0700 -@@ -24,11 +24,14 @@ - * - ******************************************************************************/ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - --#include - #include - - #include ---- GFX_Linux_KM/services4/srvkm/common/resman.c-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/common/resman.c 2011-03-17 14:20:07.000000000 -0700 -@@ -24,15 +24,17 @@ - * - ******************************************************************************/ - -+#include - #include "services_headers.h" - #include "resman.h" - - #ifdef __linux__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - --#include - #include - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9) - #include ---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-17 14:33:09.000000000 -0700 -@@ -24,9 +24,13 @@ - * - ******************************************************************************/ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - - #include - #include ---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h 2011-03-17 14:39:14.000000000 -0700 -@@ -27,11 +27,14 @@ - #ifndef __PVR_UACCESS_H__ - #define __PVR_UACCESS_H__ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - --#include - #include - - static inline unsigned long pvr_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes) ---- GFX_Linux_KM/services4/srvkm/env/linux/mm.c-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/mm.c 2011-03-17 14:46:23.000000000 -0700 -@@ -24,11 +24,14 @@ - * - ******************************************************************************/ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - --#include - #include - #include - #include ---- GFX_Linux_KM/services4/srvkm/env/linux/mutils.h-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.h 2011-03-17 14:54:37.000000000 -0700 -@@ -27,11 +27,13 @@ - #ifndef __IMG_LINUX_MUTILS_H__ - #define __IMG_LINUX_MUTILS_H__ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -- --#include -+#endif - - #if !(defined(__i386__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))) - #if defined(SUPPORT_LINUX_X86_PAT) ---- GFX_Linux_KM/services4/srvkm/env/linux/mm.h-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/mm.h 2011-03-17 15:33:56.000000000 -0700 -@@ -27,11 +27,14 @@ - #ifndef __IMG_LINUX_MM_H__ - #define __IMG_LINUX_MM_H__ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - --#include - #include - #include - #include ---- GFX_Linux_KM/services4/srvkm/env/linux/mmap.c-orig 2011-03-17 20:39:31.000000000 -0700 -+++ GFX_Linux_KM/services4/srvkm/env/linux/mmap.c 2011-03-17 20:40:00.000000000 -0700 -@@ -24,11 +24,14 @@ - * - ******************************************************************************/ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - --#include - #include - #include - #include ---- GFX_Linux_KM/services4/srvkm/env/linux/proc.c-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/proc.c 2011-03-17 21:01:35.000000000 -0700 -@@ -24,13 +24,16 @@ - * - ******************************************************************************/ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - - #include - #include --#include - #include - #include - #include ---- GFX_Linux_KM/services4/srvkm/env/linux/module.c-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/module.c 2011-03-17 21:32:19.000000000 -0700 -@@ -24,9 +24,13 @@ - * - ******************************************************************************/ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - - #if !defined(SUPPORT_DRI_DRM) - -@@ -44,7 +48,6 @@ - #include - #include - #include --#include - #include - #include - ---- GFX_Linux_KM/services4/srvkm/env/linux/event.c-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/event.c 2011-03-18 08:51:42.000000000 -0700 -@@ -24,11 +24,14 @@ - * - ******************************************************************************/ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - --#include - #include - #include - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)) ---- GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c 2011-03-18 08:58:16.000000000 -0700 -@@ -24,11 +24,14 @@ - * - ******************************************************************************/ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - --#include - #include - #include - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)) ---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c 2011-03-18 09:01:06.000000000 -0700 -@@ -26,14 +26,17 @@ - - #if defined(SUPPORT_DRI_DRM) - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif -+#endif - - #include - #include - #include --#include - #include - #include - #include ---- GFX_Linux_KM/services4/srvkm/env/linux/mutils.c-orig 2011-03-08 04:27:36.000000000 -0800 -+++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.c 2011-03-18 09:08:12.000000000 -0700 -@@ -24,10 +24,13 @@ - * - ******************************************************************************/ - -+#include -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) - #ifndef AUTOCONF_INCLUDED - #include - #endif --#include -+#endif - - #include - #include ---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig 2011-03-31 13:46:48.000000000 -0700 -+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-31 15:14:10.000000000 -0700 -@@ -76,7 +76,8 @@ static IMG_CHAR gszBufferIRQ[PVR_MAX_MSG - static PVRSRV_LINUX_MUTEX gsDebugMutexNonIRQ; - - --static spinlock_t gsDebugLockIRQ = SPIN_LOCK_UNLOCKED; -+static DEFINE_SPINLOCK(gsDebugLockIRQ); -+ - - #if !defined (USE_SPIN_LOCK) - #define USE_SPIN_LOCK (in_interrupt() || !preemptible()) diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch deleted file mode 100644 index 269d459b..00000000 --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Steve Sakoman -Subject: omap3-sgx-modules: Fix build for Linux 3.0 - -This patch implements the header change from plat/display.h to video/omapdss.h - -Signed-off-by: Steve Sakoman - ---- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig 2011-08-01 07:21:45.000000000 -0700 -+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c 2011-08-01 07:29:32.000000000 -0700 -@@ -47,12 +47,12 @@ - #if defined (SUPPORT_TI_DSS_FW) - #include - --#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)) --#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))) -+#include