omap3-sgx-modules: add patch from Steve Sakoman to fix build against kernel 3.0
authorKoen Kooi <koen@dominion.thruhere.net>
Tue, 2 Aug 2011 08:26:50 +0000 (10:26 +0200)
committerKoen Kooi <koen@dominion.thruhere.net>
Tue, 2 Aug 2011 08:26:50 +0000 (10:26 +0200)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch [new file with mode: 0644]
recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb

diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch
new file mode 100644 (file)
index 0000000..957a154
--- /dev/null
@@ -0,0 +1,38 @@
+From: Steve Sakoman\r
+Subject: omap3-sgx-modules: Fix build for Linux 3.0\r
+\r
+This patch implements the header change from plat/display.h to video/omapdss.h\r
+\r
+Signed-off-by: Steve Sakoman <steve@sakoman.com>\r
+\r
+--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig     2011-08-01 07:21:45.000000000 -0700\r
++++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c  2011-08-01 07:29:32.000000000 -0700\r
+@@ -47,12 +47,12 @@\r
+ #if defined (SUPPORT_TI_DSS_FW)\r
+ #include <asm/io.h>\r
\r
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))\r
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))\r
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39)))\r
++#include <video/omapdss.h>\r
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))\r
+ #include <plat/display.h>\r
+-#else \r
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))\r
+ #include <mach/display.h>\r
+-#endif \r
+ #else \r
+ #include <asm/arch-omap/display.h>\r
+ #endif \r
+@@ -64,7 +64,11 @@ extern int omap_dispc_request_irq(unsign\r
+ extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *);\r
+ extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr);\r
+ #else\r
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))\r
++#include <video/omapdss.h>\r
++#else\r
+ #include <plat/display.h>\r
++#endif\r
+ #include <linux/console.h>\r
+ #include <linux/fb.h>\r
+ static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;
\ No newline at end of file
index ae5f2772f91886cb741b8f283921e97e102cda91..6e49366b3dd97531be4a00870881fb83b59619ca 100644 (file)
@@ -11,10 +11,11 @@ BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin"
 
 inherit module
 
-MACHINE_KERNEL_PR_append = "j"
+MACHINE_KERNEL_PR_append = "k"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \
            file://Compile-fixes-for-38-kernel.patch \
+           file://kernel-30.patch \
           "
 SRC_URI[md5sum] = "ff8c1f2b8e4cb42f4ced6a613b081ada"
 SRC_URI[sha256sum] = "cdb0bd3964e107733d632aa8224e0537b05c1ffac34befc036423458c8d75255"