diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2011-08-02 10:26:50 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-08-02 10:26:50 +0200 |
| commit | c5b345fc6e66cd1b57f70d0fc482b6628caa6a49 (patch) | |
| tree | 9a62fcd5a4d55e8a95464a704f2159abf1e3cf6d /recipes-bsp | |
| parent | 9c621268098a3f35a58aba0d49183e0f88c91beb (diff) | |
| download | meta-ti-c5b345fc6e66cd1b57f70d0fc482b6628caa6a49.tar.gz | |
omap3-sgx-modules: add patch from Steve Sakoman to fix build against kernel 3.0
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch | 38 | ||||
| -rw-r--r-- | recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb | 3 |
2 files changed, 40 insertions, 1 deletions
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 index 00000000..957a1547 --- /dev/null +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From: Steve Sakoman | ||
| 2 | Subject: omap3-sgx-modules: Fix build for Linux 3.0 | ||
| 3 | |||
| 4 | This patch implements the header change from plat/display.h to video/omapdss.h | ||
| 5 | |||
| 6 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | ||
| 7 | |||
| 8 | --- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig 2011-08-01 07:21:45.000000000 -0700 | ||
| 9 | +++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c 2011-08-01 07:29:32.000000000 -0700 | ||
| 10 | @@ -47,12 +47,12 @@ | ||
| 11 | #if defined (SUPPORT_TI_DSS_FW) | ||
| 12 | #include <asm/io.h> | ||
| 13 | |||
| 14 | -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)) | ||
| 15 | -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) | ||
| 16 | +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))) | ||
| 17 | +#include <video/omapdss.h> | ||
| 18 | +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) | ||
| 19 | #include <plat/display.h> | ||
| 20 | -#else | ||
| 21 | +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)) | ||
| 22 | #include <mach/display.h> | ||
| 23 | -#endif | ||
| 24 | #else | ||
| 25 | #include <asm/arch-omap/display.h> | ||
| 26 | #endif | ||
| 27 | @@ -64,7 +64,11 @@ extern int omap_dispc_request_irq(unsign | ||
| 28 | extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *); | ||
| 29 | extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr); | ||
| 30 | #else | ||
| 31 | +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39)) | ||
| 32 | +#include <video/omapdss.h> | ||
| 33 | +#else | ||
| 34 | #include <plat/display.h> | ||
| 35 | +#endif | ||
| 36 | #include <linux/console.h> | ||
| 37 | #include <linux/fb.h> | ||
| 38 | static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL; \ No newline at end of file | ||
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb index ae5f2772..6e49366b 100644 --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb | |||
| @@ -11,10 +11,11 @@ BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin" | |||
| 11 | 11 | ||
| 12 | inherit module | 12 | inherit module |
| 13 | 13 | ||
| 14 | MACHINE_KERNEL_PR_append = "j" | 14 | MACHINE_KERNEL_PR_append = "k" |
| 15 | 15 | ||
| 16 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \ | 16 | SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \ |
| 17 | file://Compile-fixes-for-38-kernel.patch \ | 17 | file://Compile-fixes-for-38-kernel.patch \ |
| 18 | file://kernel-30.patch \ | ||
| 18 | " | 19 | " |
| 19 | SRC_URI[md5sum] = "ff8c1f2b8e4cb42f4ced6a613b081ada" | 20 | SRC_URI[md5sum] = "ff8c1f2b8e4cb42f4ced6a613b081ada" |
| 20 | SRC_URI[sha256sum] = "cdb0bd3964e107733d632aa8224e0537b05c1ffac34befc036423458c8d75255" | 21 | SRC_URI[sha256sum] = "cdb0bd3964e107733d632aa8224e0537b05c1ffac34befc036423458c8d75255" |