commit 58028f55bbd92d2463a66622b5f5122223e048e0
Author: Justin Waters <justin.waters@timesys.com>
Date:   Mon Apr 21 14:43:45 2014 -0400

    Modifications for building within Factory

diff --git a/GFX_Linux_KM/Makefile b/GFX_Linux_KM/Makefile
index 4470e79..753c9a4 100755
--- a/GFX_Linux_KM/Makefile
+++ b/GFX_Linux_KM/Makefile
@@ -477,6 +477,9 @@ endif
 all:
 	$(MAKE) -C $(KERNELDIR) M=`pwd` $*
 
+install:
+	$(MAKE) -C $(KERNELDIR) M=`pwd` INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) modules_install
+
 clean:
 	@find . -name "*.o" -exec rm -r {} \;
 	@find . -name "*.ko" -exec rm -r {} \;
diff --git a/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h b/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h
index 31e0dac..15f3ee9 100644
--- a/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h
+++ b/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h
@@ -75,7 +75,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define	PGPROT_UC(pv)	pgprot_noncached(pv)
 
-#if defined(__i386__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
+#if (defined(__i386__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))) || \
+    (defined(__arm__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)))
 	#define	IOREMAP(pa, bytes)	ioremap_cache(pa, bytes)
 #else	
 	#if defined(__arm__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
diff --git a/Makefile.KM b/Makefile.KM
index 4623794..39f9aa0 100755
--- a/Makefile.KM
+++ b/Makefile.KM
@@ -112,6 +112,10 @@ cleankernelmodule:
 		make -C $(GFX_KERNMOD_SRCPATH) KERNELDIR=$(KERNEL_INSTALL_DIR) BUILD=$(BUILD) clean
 
 ############################# INSTALL ##################################
+sdk_pcedit = sed \
+	-e 's,PREFIX,$(TARGETFS_INSTALL_DIR)/usr,' \
+	-e 's,LIBDIR,$(TARGETFS_INSTALL_DIR)/usr/lib,' \
+	-e 's,INCDIR,$(TARGETFS_INSTALL_DIR)/usr/include,'
 
 install_km:
 ifeq ($(OMAPES),INVALIDVAL)
@@ -126,35 +130,30 @@ endif
 	@echo "########################################################"
 	@echo "creating directories..."
 	@mkdir -p $(EXEC_DIR)
-	@mkdir -p $(GFX_LIBRARY_TARGET_PATH)
+	@mkdir -p $(TARGETFS_INSTALL_DIR)/etc/init.d
+	@mkdir -p $(TARGETFS_INSTALL_DIR)/usr/bin
+	@mkdir -p $(TARGETFS_INSTALL_DIR)/usr/include
+	@mkdir -p $(TARGETFS_INSTALL_DIR)/usr/lib/pkgconfig
 	@echo "copying startup files..."
-	@cp $(GFX_PKG_TARGETFS_PATH)/$(INIT_FILE) $(TARGETFS_INSTALL_DIR)/etc/init.d
-	@cp $(GFX_PKG_TARGETFS_PATH)/$(INIT_FILE) $(TARGETFS_INSTALL_DIR)/opt/gfxsdkdemos
-	@chmod 755 $(TARGETFS_INSTALL_DIR)/etc/init.d/$(INIT_FILE)
-	@chmod 755 $(TARGETFS_INSTALL_DIR)/opt/gfxsdkdemos
-
 	@cp $(GFX_PKG_TARGETFS_PATH)/powervr.ini $(TARGETFS_INSTALL_DIR)/etc
-	@cp $(GFX_PKG_TARGETFS_PATH)/devmem2 $(TARGETFS_INSTALL_DIR)/etc/init.d
-	@chmod 755 $(TARGETFS_INSTALL_DIR)/etc/init.d/devmem2
-	@cp $(GFX_PKG_TARGETFS_PATH)/devmem2 $(TARGETFS_INSTALL_DIR)/opt/gfxsdkdemos
-	@chmod 755 $(TARGETFS_INSTALL_DIR)/opt/gfxsdkdemos/devmem2
-	@cp $(GFX_PKG_TARGETFS_PATH)/rc.pvr $(TARGETFS_INSTALL_DIR)/etc/init.d
-	@cp $(GFX_PKG_TARGETFS_PATH)/rc.pvr $(TARGETFS_INSTALL_DIR)/opt/gfxsdkdemos
-#	@echo "installing and adding kernel modules to target file system..."
-#	@export PATH=$(CSTOOL_PATH):$(PATH) && \
-#		export CROSS_COMPILE=$(CSTOOL_PREFIX) && \
-#		./addkernelmodules.sh $(KERNEL_INSTALL_DIR) $(TARGETFS_INSTALL_DIR)
-	
+	@cp $(GFX_PKG_TARGETFS_PATH)/devmem2 $(TARGETFS_INSTALL_DIR)/usr/bin
+	@chmod 755 $(TARGETFS_INSTALL_DIR)/usr/bin/devmem2
+
+	@export KERNELDIR=$(KERNEL_INSTALL_DIR) && \
+	  export PATH=$(CSTOOL_PATH):$(PATH) && \
+	  export CROSS_COMPILE=$(CSTOOL_PREFIX) && \
+	  export ARCH=arm && \
+	  make -C $(GFX_KERNMOD_SRCPATH) KERNELDIR=$(KERNEL_INSTALL_DIR) TI_PLATFORM=$(TI_PLATFORM) BUILD=$(BUILD) INSTALL_MOD_PATH=$(TARGETFS_INSTALL_DIR) install
+
 	@echo "copying user space graphics libraries to target file system..."
 	$(eval GFX_LIB_SRCPATH=$(shell echo $(GRAPHICS_INSTALL_DIR)"/gfx_"$(BUILDPATH)_"es"$(OMAPES)))
-	@cp -rf $(GFX_LIB_SRCPATH) $(GFX_LIBRARY_TARGET_PATH)/.
-       ifeq ($(EGLIMAGE),1)
-	@cp -rf $(GFX_LIB_SRCPATH)/libGLESv2_eglimage.so $(GFX_LIBRARY_TARGET_PATH)/gfx_$(BUILDPATH)_es$(OMAPES)/libGLESv2.so
-	@cp -rf $(GFX_LIB_SRCPATH)/libGLES_CM_eglimage.so $(GFX_LIBRARY_TARGET_PATH)/gfx_$(BUILDPATH)_es$(OMAPES)/libGLES_CM.so
-	@cp -rf $(GFX_LIB_SRCPATH)/libIMGegl_eglimage.so $(GFX_LIBRARY_TARGET_PATH)/gfx_$(BUILDPATH)_es$(OMAPES)/libIMGegl.so
-	@cp -rf $(GFX_LIB_SRCPATH)/libEGL_eglimage.so $(GFX_LIBRARY_TARGET_PATH)/gfx_$(BUILDPATH)_es$(OMAPES)/libEGL.so
-	@cp -rf $(GFX_LIB_SRCPATH)/libglslcompiler_eglimage.so $(GFX_LIBRARY_TARGET_PATH)/gfx_$(BUILDPATH)_es$(OMAPES)/libglslcompiler.so
-       endif
+	$(foreach lib,libGLES_CM libusc libGLESv2 libglslcompiler libIMGegl libEGL libpvr2d libpvrPVR2D_BLITWSEGL libpvrPVR2D_FLIPWSEGL libpvrPVR2D_FRONTWSEGL libpvrPVR2D_LINUXFBWSEGL libpvrEWS_WSEGL libpvrEWS_REMWSEGL libsrv_um libsrv_init libPVRScopeServices libews,test ! -f $(GFX_LIB_SRCPATH)/$(lib).so || cp -f $(GFX_LIB_SRCPATH)/$(lib).so $(TARGETFS_INSTALL_DIR)/usr/lib/$(lib).so.1.10.2359475 && ln -sf $(lib).so.1.10.2359475 $(TARGETFS_INSTALL_DIR)/usr/lib/$(lib).so ; )
+	$(foreach bin,pvrsrvctl sgx_init_test ews_server ews_server_es2 services_test sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_render_flip_test pvr2d_test gles1test1 gles1_texture_stream gles2test1 glsltest1_vertshader.txt glsltest1_fragshaderA.txt glsltest1_fragshaderB.txt gles2_texture_stream eglinfo ews_test_gles1 ews_test_gles1_egl_image_external ews_test_gles2 ews_test_gles2_main.vert ews_test_gles2_main.frag ews_test_gles2_pp.vert ews_test_gles2_pp.frag ews_test_gles2_egl_image_external ews_test_gles2_egl_image_external.vert ews_test_gles2_egl_image_external.frag ews_test_swrender,test ! -f $(GFX_LIB_SRCPATH)/$(bin) || cp -f $(GFX_LIB_SRCPATH)/$(bin) $(TARGETFS_INSTALL_DIR)/usr/bin/$(bin) ; )
+	$(sdk_pcedit) < pkgconfig/egl.pc.in > $(TARGETFS_INSTALL_DIR)/usr/lib/pkgconfig/egl.pc
+	$(sdk_pcedit) < pkgconfig/glesv1_cm.pc.in > $(TARGETFS_INSTALL_DIR)/usr/lib/pkgconfig/glesv1_cm.pc
+	$(sdk_pcedit) < pkgconfig/glesv2.pc.in > $(TARGETFS_INSTALL_DIR)/usr/lib/pkgconfig/glesv2.pc
+	cp -rf include/* $(TARGETFS_INSTALL_DIR)/usr/include/
+
 	@echo "copying install information to target file system..."
 	@cd $(GFX_DEMOS_EXECPATH) && \
 		cp -rf * $(EXEC_DIR)/.
diff --git a/Rules.make b/Rules.make
index fdc9d37..b17b41e 100755
--- a/Rules.make
+++ b/Rules.make
@@ -67,7 +67,7 @@ GFX_KERNMOD_SRCPATH=$(GRAPHICS_INSTALL_DIR)/GFX_Linux_KM
 
 GFX_PKG_TARGETFS_PATH = $(GRAPHICS_INSTALL_DIR)/targetfs
 
-GFX_LIBRARY_TARGET_PATH = $(TARGETFS_INSTALL_DIR)/opt/gfxlibraries
+GFX_LIBRARY_TARGET_PATH = $(TARGETFS_INSTALL_DIR)/usr/gfxlibraries
 
 GFX_DEVMEM2_SRCPATH = $(GRAPHICS_INSTALL_DIR)/tools/devmem2
 
@@ -75,5 +75,5 @@ GFX_DEVMEM2_SRCPATH = $(GRAPHICS_INSTALL_DIR)/tools/devmem2
 # install') in a proper file structure. This EXEC_DIR should either be visible
 # from the target, or you will have to copy this (whole) directory onto the
 # target filesystem.
-EXEC_DIR=$(TARGETFS_INSTALL_DIR)/opt/gfxsdkdemos
+EXEC_DIR=$(TARGETFS_INSTALL_DIR)/usr/gfxsdkdemos
 ################################################################################
diff --git a/pkgconfig/egl.pc.in b/pkgconfig/egl.pc.in
new file mode 100644
index 0000000..446cbf1
--- /dev/null
+++ b/pkgconfig/egl.pc.in
@@ -0,0 +1,12 @@
+prefix=PREFIX
+exec_prefix=${prefix}
+libdir=LIBDIR
+includedir=INCDIR/OGLES2
+
+Name: egl
+Description: EGL library
+Requires.private: 
+Version:
+Libs: -L${libdir} -lEGL
+Libs.private: -lm -lpthread
+Cflags: -I${includedir} 
diff --git a/pkgconfig/glesv1_cm.pc.in b/pkgconfig/glesv1_cm.pc.in
new file mode 100644
index 0000000..e0dabe5
--- /dev/null
+++ b/pkgconfig/glesv1_cm.pc.in
@@ -0,0 +1,12 @@
+prefix=PREFIX
+exec_prefix=${prefix}
+libdir=LIBDIR/OGLES
+includedir=INCDIR
+
+Name: glesv1_cm
+Description: OpenGL ES 1.1 CM library
+Requires.private: 
+Version:
+Libs: -L${libdir} -lGLESv1_CM
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir} 
diff --git a/pkgconfig/glesv2.pc.in b/pkgconfig/glesv2.pc.in
new file mode 100644
index 0000000..1b5e0cf
--- /dev/null
+++ b/pkgconfig/glesv2.pc.in
@@ -0,0 +1,12 @@
+prefix=PREFIX
+exec_prefix=${prefix}
+libdir=LIBDIR
+includedir=INCDIR/OGLES2
+
+Name: glesv2
+Description: OpenGL ES 2.0 library
+Requires.private: 
+Version:
+Libs: -L${libdir} -lGLESv2
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir}