Browse files

AM335x support and Vsync fixes for ti81xx

  • Loading branch information...
1 parent 5a03af6 commit 692a0598652d0ba5bf3d4ca0fcea9c943adff6b8 @aditya-nellutla aditya-nellutla committed with Pankaj Sep 7, 2011
View
6 Makefile
@@ -12,14 +12,16 @@ install: install_km
############################# HELP ##################################
help:
@echo ""
- @echo "Usage (for build): make BUILD={debug | release} OMAPES={5.x | 6.x} "
+ @echo "Usage (for build): make BUILD={debug | release} OMAPES={3.x | 5.x | 6.x | 7.x} "
@echo " Platform OMAPES "
@echo " -------- ------ "
+ @echo " OMAP35x/AM35x 3.x "
@echo " OMAP37x/AM37x 5.x "
@echo " 816x(389x)/814x(387x) 6.x "
+ @echo " OMAP4/AM45x 7.x "
@echo "--> Specifying OMAPES is mandatory. BUILD=release by default"
@echo ""
- @echo "Usage (for install): make BUILD=(debug | release} OMAPES={5.x | 6.x} install"
+ @echo "Usage (for install): make BUILD=(debug | release} OMAPES={3.x | 5.x | 6.x | 7.x} install"
@echo "--> See online Graphics Getting Started Guide for further details."
@echo ""
View
97 Makefile.KM.Android
@@ -1,6 +1,6 @@
include Rules.make
-OMAPES:=INVALIDVAL
+OMAPES:=INVALIDVAL
.PHONY: all_km buildkernel
.PHONY: clean_km cleankernelmodule
@@ -12,56 +12,69 @@ buildkernel:
ifeq ($(OMAPES),3.x)
@echo "building the sgx kernel modules..."
-
+
@export KERNELDIR=$(KERNEL_INSTALL_DIR) && \
export PATH=$(CSTOOL_PATH):$(PATH) && \
export CROSS_COMPILE=$(CSTOOL_PREFIX) && \
export EURASIAROOT=$(EURASIAROOT) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
export ARCH=arm && \
- make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=121
+ make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=121
@echo "copying the sgx kernel modules to $(GFX_REL_ES3_LIB_SRCPATH_ANDROID)"
- @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/pvrsrvkm.ko $(GFX_REL_ES3_LIB_SRCPATH_ANDROID)/.
- @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/omaplfb.ko $(GFX_REL_ES3_LIB_SRCPATH_ANDROID)/.
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/pvrsrvkm.ko $(GFX_REL_ES3_LIB_SRCPATH_ANDROID)/.
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/omaplfb.ko $(GFX_REL_ES3_LIB_SRCPATH_ANDROID)/.
+else ifeq ($(OMAPES),4.x)
+ @echo "building the sgx kernel modules..."
+
+ @export KERNELDIR=$(KERNEL_INSTALL_DIR) && \
+ export PATH=$(CSTOOL_PATH):$(PATH) && \
+ export CROSS_COMPILE=$(CSTOOL_PREFIX) && \
+ export EURASIAROOT=$(EURASIAROOT) && \
+ export ANDROID_ROOT=$(ANDROID_ROOT) && \
+ export ARCH=arm && \
+ make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=125 BUILD=release
+ @echo "copying the sgx kernel modules to $(GFX_REL_ES4_LIB_SRCPATH_ANDROID)"
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/pvrsrvkm.ko $(GFX_REL_ES4_LIB_SRCPATH_ANDROID)/.
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/omaplfb.ko $(GFX_REL_ES4_LIB_SRCPATH_ANDROID)/.
else ifeq ($(OMAPES),5.x)
@echo "building the sgx kernel modules..."
-
+
@export KERNELDIR=$(KERNEL_INSTALL_DIR) && \
export PATH=$(CSTOOL_PATH):$(PATH) && \
export CROSS_COMPILE=$(CSTOOL_PREFIX) && \
export EURASIAROOT=$(EURASIAROOT) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
export ARCH=arm && \
- make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=125
+ make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=125
@echo "copying the sgx kernel modules to $(GFX_REL_ES5_LIB_SRCPATH_ANDROID)"
- @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/pvrsrvkm.ko $(GFX_REL_ES5_LIB_SRCPATH_ANDROID)/.
- @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/omaplfb.ko $(GFX_REL_ES5_LIB_SRCPATH_ANDROID)/.
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/pvrsrvkm.ko $(GFX_REL_ES5_LIB_SRCPATH_ANDROID)/.
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/omaplfb.ko $(GFX_REL_ES5_LIB_SRCPATH_ANDROID)/.
else ifeq ($(OMAPES),6.x)
@echo "building the sgx kernel modules..."
-
+
@export KERNELDIR=$(KERNEL_INSTALL_DIR) && \
export PATH=$(CSTOOL_PATH):$(PATH) && \
export CROSS_COMPILE=$(CSTOOL_PREFIX) && \
export EURASIAROOT=$(EURASIAROOT) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
export ARCH=arm && \
- make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=125
+ make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=125
@echo "copying the sgx kernel modules to $(GFX_REL_ES6_LIB_SRCPATH_ANDROID)"
- @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/pvrsrvkm.ko $(GFX_REL_ES6_LIB_SRCPATH_ANDROID)/.
- @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/omaplfb.ko $(GFX_REL_ES6_LIB_SRCPATH_ANDROID)/.
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/pvrsrvkm.ko $(GFX_REL_ES6_LIB_SRCPATH_ANDROID)/.
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/omaplfb.ko $(GFX_REL_ES6_LIB_SRCPATH_ANDROID)/.
else ifeq ($(OMAPES),7.x)
@echo "building the sgx kernel modules..."
-
+
@export KERNELDIR=$(KERNEL_INSTALL_DIR) && \
export PATH=$(CSTOOL_PATH):$(PATH) && \
export CROSS_COMPILE=$(CSTOOL_PREFIX) && \
export EURASIAROOT=$(EURASIAROOT) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
export ARCH=arm && \
- make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=540 SGXCOREREV=120
+ make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=540 SGXCOREREV=120
@echo "copying the sgx kernel modules to $(GFX_REL_ES7_LIB_SRCPATH_ANDROID)"
- @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/pvrsrvkm.ko $(GFX_REL_ES7_LIB_SRCPATH_ANDROID)/.
- @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/omaplfb.ko $(GFX_REL_ES7_LIB_SRCPATH_ANDROID)/.
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/pvrsrvkm.ko $(GFX_REL_ES7_LIB_SRCPATH_ANDROID)/.
+ @cp -rf $(GFX_KERNMOD_SRCPATH)/eurasiacon/binary2_omap_android_release/target/omaplfb.ko $(GFX_REL_ES7_LIB_SRCPATH_ANDROID)/.
else
@echo "OMAPES value not specified (Mandatory value)"
exit 1
@@ -75,7 +88,7 @@ builddevmem2:
make -C $(GFX_DEVMEM2_SRCPATH) && make -C $(GFX_DEVMEM2_SRCPATH) install
cleandevmem2:
- make -C $(GFX_DEVMEM2_SRCPATH) clean
+ make -C $(GFX_DEVMEM2_SRCPATH) clean
cleankernelmodule:
ifeq ($(OMAPES),7.x)
@@ -86,7 +99,16 @@ ifeq ($(OMAPES),7.x)
export EURASIAROOT=$(EURASIAROOT) && \
export DISCIMAGE=$(ANDROID_DISCIMAGE) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
- make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=540 SGXCOREREV=120 clean
+ make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=540 SGXCOREREV=120 clean
+else ifeq ($(OMAPES),3.x)
+ @echo "cleaning the sgx kernel modules..."
+ export KERNELDIR=$(KERNEL_INSTALL_DIR) && \
+ export PATH=$(CSTOOL_PATH):$(PATH) && \
+ export CROSS_COMPILE=$(CSTOOL_PREFIX) && \
+ export EURASIAROOT=$(EURASIAROOT) && \
+ export DISCIMAGE=$(ANDROID_DISCIMAGE) && \
+ export ANDROID_ROOT=$(ANDROID_ROOT) && \
+ make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=121 clean
else
@echo "cleaning the sgx kernel modules..."
export KERNELDIR=$(KERNEL_INSTALL_DIR) && \
@@ -95,46 +117,53 @@ else
export EURASIAROOT=$(EURASIAROOT) && \
export DISCIMAGE=$(ANDROID_DISCIMAGE) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
- make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=125 clean
+ make -C $(GFX_KERNMOD_SRCPATH)/eurasiacon/build/linux2/omap_android KERNELDIR=$(KERNEL_INSTALL_DIR) TARGET_PRODUCT=$(TARGET_PRODUCT) SGXCORE=530 SGXCOREREV=125 clean
endif
############################# INSTALL ##################################
install_km:
-ifeq ($(OMAPES),INVALIDVAL)
+ ifeq ($(OMAPES),INVALIDVAL)
@echo "OMAPES value not specified (Mandatory value)..Exiting..."
exit 1
-endif
+ endif
# @patch -p0 -d $(ANDROID_DISCIMAGE) < initrc.patch
-ifeq ($(OMAPES),3.x)
+ ifeq ($(OMAPES),3.x)
@cd $(GFX_REL_ES3_LIB_SRCPATH_ANDROID) && \
export DISCIMAGE=$(ANDROID_DISCIMAGE) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
export ANDROID_PRODUCT=$(TARGET_PRODUCT) && \
- ./install.sh --no-x --no-bcdevice
-endif
-ifeq ($(OMAPES),5.x)
+ ./install.sh --no-x --no-bcdevice
+ endif
+ ifeq ($(OMAPES),4.x)
+ @cd $(GFX_REL_ES4_LIB_SRCPATH_ANDROID) && \
+ export DISCIMAGE=$(ANDROID_DISCIMAGE) && \
+ export ANDROID_ROOT=$(ANDROID_ROOT) && \
+ export ANDROID_PRODUCT=$(TARGET_PRODUCT) && \
+ ./install.sh --no-x --no-bcdevice
+ endif
+ ifeq ($(OMAPES),5.x)
@cd $(GFX_REL_ES5_LIB_SRCPATH_ANDROID) && \
export DISCIMAGE=$(ANDROID_DISCIMAGE) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
export ANDROID_PRODUCT=$(TARGET_PRODUCT) && \
- ./install.sh --no-x --no-bcdevice
-endif
-ifeq ($(OMAPES),6.x)
+ ./install.sh --no-x --no-bcdevice
+ endif
+ ifeq ($(OMAPES),6.x)
@cd $(GFX_REL_ES6_LIB_SRCPATH_ANDROID) && \
export DISCIMAGE=$(ANDROID_DISCIMAGE) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
export ANDROID_PRODUCT=$(TARGET_PRODUCT) && \
- ./install.sh --no-x --no-bcdevice
-endif
-ifeq ($(OMAPES),7.x)
+ ./install.sh --no-x --no-bcdevice
+ endif
+ ifeq ($(OMAPES),7.x)
@cd $(GFX_REL_ES7_LIB_SRCPATH_ANDROID) && \
export DISCIMAGE=$(ANDROID_DISCIMAGE) && \
export ANDROID_ROOT=$(ANDROID_ROOT) && \
export ANDROID_PRODUCT=$(TARGET_PRODUCT) && \
- ./install.sh --no-x --no-bcdevice
-endif
+ ./install.sh --no-x --no-bcdevice
+ endif
############################# HELP ##################################
help_km:
View
49 README
@@ -1,13 +1,13 @@
+
SGX Embedded Systems DDK for Linux kernel.
Copyright (C) Imagination Technologies Ltd. All rights reserved.
======================================================================
-About
+About
-------------------------------------------
-This is the Imagination Technologies SGX DDK for the Linux kernel.
-Modified by the Texas Instruments to support Android on Rowboat devices.
+This is the Imagination Technologies SGX DDK for the Linux kernel.
License
@@ -16,48 +16,33 @@ License
You may use, distribute and copy this software under the terms of
GNU General Public License version 2.
-The full GNU General Public License version 2 is included in this
+The full GNU General Public License version 2 is included in this
distribution in the file called "COPYING".
Build and Install Instructions
-------------------------------------------
-1) Edit Rules.make file and set appropriate paths
-
-2) Build SDK Using -
- $ make OMAPES=X.x (see make help for more info)
-
- Ex:
-
- $ make help
-
- Usage (for build): make BUILD={debug | release} OMAPES={5.x | 6.x}
- Platform OMAPES
- -------- ------
- AM35x 3.x
- OMAP37x/AM37x 5.x
- 816x(389x)/814x(387x) 6.x
- OMAP4/AM45x 7.x
- --> Specifying OMAPES is mandatory. BUILD=release by default
-
- Usage (for install): make BUILD=(debug | release} OMAPES={3.x | 5.x | 6.x | 7.x} install
- --> See online Graphics Getting Started Guide for further details.
+For details see the "INSTALL" file.
+To build for, change to the appropriate target directory, e.g.:
+$ cd eurasiacon/build/linux/platform/kbuild
-4) Install the SDK into File system using:
- $ sudo make OMAPES=X.x install
+Issue the make command:
+$ make BUILD=debug all
-(This copies the *.so and *.ko to file system pointed to by TARGETFS_INSTALL_DIR variable).
+The DDK software must be installed by the root user. Become the root user:
+$ su
+Install the DDK software:
+$ make install
-Note: In Case of AM389x platforms Syslink and VPSS modules need to be built.
+Become an ordinary user again:
+$ exit
-For more details please refer- http://processors.wiki.ti.com/index.php/ANDROID_RN_4_03_01_00
Contact information:
-------------------------------------------
-http://arowboat.org/
-http://groups.google.com/group/rowboat
-http://e2e.ti.com/android
+Imagination Technologies Ltd. <gpl-support@imgtec.com>
+Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
View
11 Rules.make
@@ -11,17 +11,18 @@ GRAPHICS_INSTALL_DIR=$(ANDROID_ROOT_DIR)/hardware/ti/sgx
ANDROID_ROOT=$(ANDROID_ROOT_DIR)
#set toolchain root path for arm-eabi
-CSTOOL_DIR=$(ANDROID_ROOT_DIR)/prebuilt/linux-x86/toolchain/arm-eabi-4.4.0
+CSTOOL_DIR=$(ANDROID_ROOT_DIR)/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3
CSTOOL_PREFIX=arm-eabi-
CSTOOL_PATH=$(CSTOOL_DIR)/bin
CSTOOL_LIBSTDC++_PATH=$(CSTOOL_DIR)/arm-none-linux-gnueabi/libc/usr/lib
#set the kernel installation path
-KERNEL_INSTALL_DIR=$(ANDROID_ROOT_DIR)/kernel
-
+#KERNEL_INSTALL_DIR=$(ANDROID_ROOT_DIR)/kernel
+KERNEL_INSTALL_DIR=/home1/aditya/SA/kernel_fix/kernel
#set filesystem path
-TARGETFS_INSTALL_DIR=$(ANDROID_ROOT_DIR)/out/target/product/$(TARGET_PRODUCT)
+#TARGETFS_INSTALL_DIR=$(ANDROID_ROOT_DIR)/out/target/product/$(TARGET_PRODUCT)
+TARGETFS_INSTALL_DIR=/home1/aditya/android/android_rootfs_cent
#Android
ANDROID_DISCIMAGE=$(TARGETFS_INSTALL_DIR)/
@@ -34,13 +35,15 @@ DISCIMAGE=$(ANDROID_DISCIMAGE)
EURASIAROOT=$(GRAPHICS_INSTALL_DIR)
GFX_REL_ES3_LIB_SRCPATH=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es3.x
+GFX_REL_ES4_LIB_SRCPATH=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es4.x
GFX_REL_ES5_LIB_SRCPATH=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es5.x
GFX_REL_ES6_LIB_SRCPATH=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es6.x
GFX_REL_ES7_LIB_SRCPATH=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es7.x
#Android Specific
GFX_REL_ES3_LIB_SRCPATH_ANDROID=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es3.x_android
+GFX_REL_ES4_LIB_SRCPATH_ANDROID=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es4.x_android
GFX_REL_ES5_LIB_SRCPATH_ANDROID=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es5.x_android
GFX_REL_ES6_LIB_SRCPATH_ANDROID=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es6.x_android
GFX_REL_ES7_LIB_SRCPATH_ANDROID=$(GRAPHICS_INSTALL_DIR)/gfx_rel_es7.x_android
View
24 eurasiacon/build/linux2/omap_android/Makefile
@@ -5,9 +5,9 @@
# under the terms and conditions of the GNU General Public License,
# version 2, as published by the Free Software Foundation.
#
-# This program is distributed in the hope it will be useful but, except
-# as otherwise stated in writing, without any warranty; without even the
-# implied warranty of merchantability or fitness for a particular purpose.
+# This program is distributed in the hope it will be useful but, except
+# as otherwise stated in writing, without any warranty; without even the
+# implied warranty of merchantability or fitness for a particular purpose.
# See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
@@ -19,8 +19,8 @@
#
# Contact Information:
# Imagination Technologies Ltd. <gpl-support@imgtec.com>
-# Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
-#
+# Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
+#
#
TARGET_PRODUCT ?= blaze
@@ -38,6 +38,12 @@ SGXCORE := 530
SGX_CORE_REV := 121
endif
+ifeq ($(OMAPES),4.x)
+PVR_SYSTEM := ti335x
+SGXCORE := 530
+SGX_CORE_REV := 125
+endif
+
ifeq ($(OMAPES),5.x)
PVR_SYSTEM := omap3
SGXCORE := 530
@@ -79,11 +85,19 @@ SUPPORT_LINUX_USING_WORKQUEUES := 0
SUPPORT_LINUX_USING_SHARED_WORKQUEUES := 1
SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
DISPLAY_CONTROLLER := omaplfb
+ifeq ($(OMAPES),4.x)
+DISPLAY_CONTROLLER_COMPONENT := dc_ti335x_linux
+else
DISPLAY_CONTROLLER_COMPONENT := dc_omapfb3_linux
+endif
OMAP_NON_FLIP_DISPLAY := 1
else
+ifeq ($(OMAPES),4.x)
+DISPLAY_CONTROLLER_COMPONENT := dc_ti335x_linux
+else
DISPLAY_CONTROLLER_COMPONENT := dc_omapfb3_linux
endif
+endif
ifeq ($(SUPPORT_DRI_DRM),1)
PVR_DRI_DRM_NOT_PCI := 1
View
37 services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
@@ -71,11 +71,14 @@
#endif
#if defined PLAT_TI81xx
-#include <../drivers/video/ti81xx/ti81xxfb/fbpriv.h>
+#include <linux/ti81xxfb.h>
+#include <plat/ti81xx-vpss.h>
#else
-#include <omapfb/omapfb.h>
+#include <linux/omapfb.h>
#endif
+#include <omapfb/omapfb.h>
+
#if defined(DEBUG)
#undef DEBUG
#endif
@@ -365,12 +368,30 @@ OMAPLFB_BOOL OMAPLFBSetUpdateMode(OMAPLFB_DEVINFO *psDevInfo, OMAPLFB_UPDATE_MOD
OMAPLFB_BOOL OMAPLFBWaitForVSync(OMAPLFB_DEVINFO *psDevInfo)
{
#if defined PLAT_TI81xx
- struct vps_grpx_ctrl *gctrl;
- int r = 0;
- struct ti81xxfb_info *ofbi;
- ofbi = FB2TFB(psDevInfo->psLINFBInfo);
- gctrl = ofbi->gctrl;
- r = gctrl->wait_for_vsync(gctrl);
+ int r;
+ void grpx_irq_wait_handler(void *data)
+
+ {
+ complete((struct completion *)data);
+ }
+
+ DECLARE_COMPLETION_ONSTACK(completion);
+
+ if (vps_grpx_register_isr((vsync_callback_t)grpx_irq_wait_handler, &completion, psDevInfo->uiFBDevID) != 0)
+ {
+ printk (KERN_WARNING DRIVER_PREFIX ": Failed to register for vsync call back\n");
+ return OMAPLFB_FALSE;
+ }
+
+// timeout = wait_for_completion_interruptible_timeout(&completion, timeout);
+
+ r = wait_for_completion_interruptible(&completion);
+
+ if (vps_grpx_unregister_isr((vsync_callback_t)grpx_irq_wait_handler , &completion, psDevInfo->uiFBDevID) != 0)
+ {
+ printk (KERN_WARNING DRIVER_PREFIX ": Failed to un-register for vsync call back\n");
+ return OMAPLFB_FALSE;
+ }
return OMAPLFB_TRUE;
#else
struct omap_dss_device *psDSSDev = fb2display(psDevInfo->psLINFBInfo);
View
4 services4/srvkm/common/resman.c
@@ -27,12 +27,14 @@
#include "services_headers.h"
#include "resman.h"
+#include <linux/version.h>
#ifdef __linux__
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
-#include <linux/version.h>
#include <linux/sched.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
#include <linux/hardirq.h>
View
18 services4/srvkm/devices/sgx/sgxinit.c
@@ -1,26 +1,26 @@
/**********************************************************************
*
* Copyright (C) Imagination Technologies Ltd. All rights reserved.
- *
+ *
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful but, except
- * as otherwise stated in writing, without any warranty; without even the
- * implied warranty of merchantability or fitness for a particular purpose.
+ *
+ * This program is distributed in the hope it will be useful but, except
+ * as otherwise stated in writing, without any warranty; without even the
+ * implied warranty of merchantability or fitness for a particular purpose.
* See the GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ *
* The full GNU General Public License is included in this distribution in
* the file called "COPYING".
*
* Contact Information:
* Imagination Technologies Ltd. <gpl-support@imgtec.com>
- * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
+ * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
*
******************************************************************************/
@@ -362,7 +362,7 @@ PVRSRV_ERROR SGXInitialise(PVRSRV_SGXDEV_INFO *psDevInfo,
#if defined(SGX540) && (SGX_CORE_REV == 120)
OSWriteHWReg(psDevInfo->pvRegsBaseKM, 0xFF08, 0x80000000);//OCP Bypass mode
#endif
-
+
psSGXHostCtl->ui32HostClock = OSClockus();
psSGXHostCtl->ui32InitStatus = 0;
View
4 services4/srvkm/env/linux/event.c
@@ -23,12 +23,14 @@
* Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
*
******************************************************************************/
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
-#include <linux/version.h>
#include <asm/io.h>
#include <asm/page.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
View
4 services4/srvkm/env/linux/mm.c
@@ -23,12 +23,14 @@
* Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
*
******************************************************************************/
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
-#include <linux/version.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>
#include <asm/io.h>
View
5 services4/srvkm/env/linux/mm.h
@@ -27,11 +27,14 @@
#ifndef __IMG_LINUX_MM_H__
#define __IMG_LINUX_MM_H__
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
-#include <linux/version.h>
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/list.h>
View
4 services4/srvkm/env/linux/mmap.c
@@ -23,12 +23,14 @@
* Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
*
******************************************************************************/
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
-#include <linux/version.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/vmalloc.h>
View
4 services4/srvkm/env/linux/module.c
@@ -23,10 +23,13 @@
* Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
*
******************************************************************************/
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
#if defined(SUPPORT_DRI_DRM)
#define PVR_MOD_STATIC
@@ -53,7 +56,6 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/fs.h>
#include <linux/proc_fs.h>
View
4 services4/srvkm/env/linux/mutils.c
@@ -23,11 +23,13 @@
* Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
*
******************************************************************************/
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
-#include <linux/version.h>
+#endif
#include <linux/spinlock.h>
#include <linux/mm.h>
View
5 services4/srvkm/env/linux/mutils.h
@@ -27,11 +27,14 @@
#ifndef __IMG_LINUX_MUTILS_H__
#define __IMG_LINUX_MUTILS_H__
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
-#include <linux/version.h>
#if !(defined(__i386__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)))
#if defined(SUPPORT_LINUX_X86_PAT)
View
5 services4/srvkm/env/linux/osfunc.c
@@ -24,11 +24,14 @@
*
******************************************************************************/
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
-#include <linux/version.h>
#include <asm/io.h>
#include <asm/page.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
View
4 services4/srvkm/env/linux/proc.c
@@ -23,14 +23,16 @@
* Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
*
******************************************************************************/
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
#include <linux/init.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/fs.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
View
4 services4/srvkm/env/linux/pvr_debug.c
@@ -24,9 +24,13 @@
*
******************************************************************************/
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
#include <asm/io.h>
#include <asm/uaccess.h>
View
5 services4/srvkm/env/linux/pvr_uaccess.h
@@ -27,11 +27,14 @@
#ifndef __PVR_UACCESS_H__
#define __PVR_UACCESS_H__
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38))
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
#endif
+#endif
-#include <linux/version.h>
#include <asm/uaccess.h>
static inline unsigned long pvr_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes)
View
24 tools/devmem2/Makefile 100755 → 100644
@@ -5,18 +5,18 @@ include ../../Rules.make
.PHONY: clean
TARGETFSDIR = ../../targetfs/
-CROSS_COMPILE=arm-eabi-
+CROSS_COMPILE=$(CSTOOL_PATH)/$(CSTOOL_PREFIX)
-PLAT_CC = $(CSTOOL_PATH)/$(CROSS_COMPILE)gcc
-PLAT_CPP = $(CSTOOL_PATH)/$(CROSS_COMPILE)g++
-PLAT_AR = $(CSTOOL_PATH)/$(CROSS_COMPILE)ar
+PLAT_CC = $(CROSS_COMPILE)gcc
+PLAT_CPP = $(CROSS_COMPILE)g++
+PLAT_AR = $(CROSS_COMPILE)ar
DEBUG_RELEASE = Release
PLAT_CFLAGS = -Wall -DRELEASE -O2
TOOLCHAIN = $(CSTOOL_DIR)
PLAT_OBJPATH = ./Obj
-PLAT_LINK = -lm -ldl -lc -fno-short-enums -L$(ANDROID_ROOT)/out/target/product/$(TARGET_PRODUCT)/obj/lib/ -Wl,-dynamic-linker,/system/bin/linker -nostdlib
-OBJECTS1 = $(ANDROID_ROOT)/prebuilt/linux-x86/toolchain/arm-eabi-4.4.0/arm-eabi/lib/ldscripts/armelf.x $(ANDROID_ROOT)/out/target/product/$(TARGET_PRODUCT)/obj/lib/crtbegin_dynamic.o $(ANDROID_ROOT)/out/target/product/$(TARGET_PRODUCT)/obj/lib/crtend_android.o
+PLAT_LINK = -lm -ldl -lc -fno-short-enums -L$(ANDROID_ROOT)/out/target/product/$(TARGET_PRODUCT)/obj/lib/ -Wl,-dynamic-linker,/system/bin/linker -nostdlib -Wl,-T,$(ANDROID_ROOT)/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/arm-eabi/lib/ldscripts/armelf.x
+OBJECTS1 = $(ANDROID_ROOT)/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/arm-eabi/lib/ldscripts/armelf.x $(ANDROID_ROOT)/out/target/product/$(TARGET_PRODUCT)/obj/lib/crtbegin_dynamic.o $(ANDROID_ROOT)/out/target/product/$(TARGET_PRODUCT)/obj/lib/crtend_android.o
SRCNAME = devmem2
@@ -29,22 +29,22 @@ INCLUDES += -I$(ANDROID_ROOT)/bionic/libc/include \
-I$(ANDROID_ROOT)/bionic/libc/kernel/arch-arm/ \
-I$(ANDROID_ROOT)/bionic/libc/kernel/common
-$(PLAT_OBJPATH)/$(OUTNAME) : $(OBJECTS)
+$(PLAT_OBJPATH)/$(OUTNAME) : $(OBJECTS)
mkdir -p $(PLAT_OBJPATH)
$(PLAT_CPP) -o $(PLAT_OBJPATH)/$(OUTNAME) $(OBJECTS) $(OBJECTS1) $(OBJECTS2) $(LINK) $(PLAT_LINK) $(VG_LINK) $(PVR2D_LINK)
-$(PLAT_OBJPATH)/%.o: %.cpp
+$(PLAT_OBJPATH)/%.o: %.cpp
mkdir -p $(PLAT_OBJPATH)
$(PLAT_CC) $(PLAT_CFLAGS) -c $(COMMON_INCLUDES) $(INCLUDES) $^ -o $@
-$(PLAT_OBJPATH)/%.o: %.c
+$(PLAT_OBJPATH)/%.o: %.c
mkdir -p $(PLAT_OBJPATH)
$(PLAT_CC) $(PLAT_CFLAGS) -c $(COMMON_INCLUDES) $(INCLUDES) $^ -o $@
install:
-ifeq ($(OMAPES),3.x)
- @echo "copying devmem2 to $(GFX_REL_ES5_LIB_SRCPATH_ANDROID)"
- cp $(PLAT_OBJPATH)/$(OUTNAME) $(GFX_REL_ES3_LIB_SRCPATH_ANDROID)
+ifeq ($(OMAPES),4.x)
+ @echo "copying devmem2 to $(GFX_REL_ES4_LIB_SRCPATH_ANDROID)"
+ cp $(PLAT_OBJPATH)/$(OUTNAME) $(GFX_REL_ES4_LIB_SRCPATH_ANDROID)
endif
ifeq ($(OMAPES),5.x)
View
0 tools/devmem2/devmem2.c 100755 → 100644
File mode changed.
View
BIN uninstall
Binary file not shown.

0 comments on commit 692a059

Please sign in to comment.