jacinto6: sgx_src: build pvrsrv kernel module from source

Changes to switch from using prebuilt pvrsrv kernel module to
building pvrsrv kernel module as part of Android build and install
it in /vendor/lib/modules location.

The pvrsrvkm kernel module would no longer be part of sgx.tgz tarball.

Change-Id: I107088d3c0423bccfe78aa0733a4c4c1c1ad7c97
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>

5 files changed, 69 insertions, 43 deletions

diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index 01f5ba6..9c7e334 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
diff --git a/jacinto6/sgx/Android.mk b/jacinto6/sgx/Android.mk
index 9d007ad..bfb50e3 100644
--- a/jacinto6/sgx/Android.mk
+++ b/jacinto6/sgx/Android.mk
@@ -74,26 +74,6 @@ $$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
         $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
 endef
 
-define _add-sgx-vendor-km
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid SGX module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $$(TARGET_OUT)/lib/$(dir $1)
-LOCAL_STRIP_MODULE := false
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_ETC)
-LOCAL_PATH := $$(img-sgx.untarred_bin)
-include $$(BUILD_SYSTEM)/base_rules.mk
-$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
-$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
-        @echo "Copy $$@ <- $$(PRIVATE_SRC)"
-        @mkdir -p $$(dir $$@)
-        $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
-endef
-
 prebuilt_sgx_vendor_libs := \
         lib/libIMGegl.so \
         lib/libglslcompiler.so \
@@ -116,11 +96,8 @@ prebuilt_sgx_vendor_bins := \
 #prebuilt_sgx_vendor_etc := \
 #       etc/powervr.ini
 
-prebuilt_sgx_vendor_km := \
-        modules/pvrsrvkm.ko
-
 prebuilt_sgx_modules := \
-  $(foreach _file,$(prebuilt_sgx_vendor_libs) $(prebuilt_sgx_vendor_bins) $(prebuilt_sgx_vendor_etc) $(prebuilt_sgx_vendor_km),\
+  $(foreach _file,$(prebuilt_sgx_vendor_libs) $(prebuilt_sgx_vendor_bins) $(prebuilt_sgx_vendor_etc),\
     $(notdir $(basename $(_file))))
 
 include $(CLEAR_VARS)
@@ -138,15 +115,10 @@ $(foreach _file,$(prebuilt_sgx_vendor_bins),\
 $(foreach _file,$(prebuilt_sgx_vendor_etc),\
   $(eval $(call _add-sgx-vendor-etc,$(_file))))
 
-$(foreach _file,$(prebuilt_sgx_vendor_km),\
-  $(eval $(call _add-sgx-vendor-km,$(_file))))
-
 prebuilt_sgx_modules :=
 prebuilt_sgx_vendor_libs :=
 prebuilt_sgx_vendor_bins :=
 prebuilt_sgx_vendor_etc :=
-prebuilt_sgx_vendor_km :=
 _add-sgx-vendor-lib :=
 _add-sgx-vendor-bin :=
 _add-sgx-vendor-etc :=
-_add-sgx-vendor-km :=
diff --git a/jacinto6/sgx_src/Android.mk b/jacinto6/sgx_src/Android.mk
new file mode 100644
index 0000000..663404c
--- /dev/null
+++ b/jacinto6/sgx_src/Android.mk
@@ -0,0 +1,53 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+MODULE_TARGET := pvrsrvkm.ko
+LOCAL_MODULE := $(basename $(MODULE_TARGET))
+LOCAL_MODULE_SUFFIX := $(suffix $(MODULE_TARGET))
+LOCAL_MODULE_CLASS := ETC
+
+local-build := $(LOCAL_PATH)/eurasia_km/eurasiacon/build/linux2/omap_android
+out-intermediates := $(call intermediates-dir-for, ETC, $(LOCAL_MODULE))
+
+PVRSRVKM := $(LOCAL_PATH)/$(MODULE_TARGET)
+
+$(PVRSRVKM): $(local-build)/Makefile $(KERNELDIR)/.version
+        @echo "Building $@"
+        @$(MAKE) -f Makefile -C $(local-build) \
+                CROSS_COMPILE=arm-linux-androideabi- \
+                KERNEL_CROSS_COMPILE=arm-linux-androideabi- \
+                KERNELDIR=$(KERNELDIR) \
+                ARCH=arm \
+                ANDROID_ROOT=$(ANDROID_BUILD_TOP) \
+                PLATFORM_RELEASE="8.0" \
+                OUT=$(ANDROID_BUILD_TOP)/$(out-intermediates)
+        @$(ACP) -fp $(ANDROID_BUILD_TOP)/$(out-intermediates)/target/$(MODULE_TARGET) $@
+        @echo "Finished building $@"
+
+GEN := $(out-intermediates)/$(MODULE_TARGET)
+$(GEN): $(PVRSRVKM)
+        @echo "Copying $@ <- $<"
+        $(copy-file-to-target)
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(MODULE_TARGET)
+LOCAL_GENERATED_SOURCES += $(GEN)
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/modules
+LOCAL_STRIP_MODULE := false
+BOARD_VENDOR_KERNEL_MODULES += $(PVRSRVKM)
+include $(BUILD_PREBUILT)
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk
index f2a5600..b99d976 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk
@@ -41,25 +41,25 @@
 # If there's no build.prop file in the expected location, bail out. Tell the
 # user which file we were trying to read in case TARGET_DEVICE was not set.
 #
-BUILD_PROP := $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/build.prop
-ifeq ($(wildcard $(BUILD_PROP)),)
-$(warning *** Could not determine Android version.  Did you set ANDROID_ROOT,\
-OUT_DIR and TARGET_DEVICE in your environment correctly?)
-$(error Error reading $(BUILD_PROP))
-endif
+#BUILD_PROP := $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/build.prop
+#ifeq ($(wildcard $(BUILD_PROP)),)
+#$(warning *** Could not determine Android version.  Did you set ANDROID_ROOT,\
+#OUT_DIR and TARGET_DEVICE in your environment correctly?)
+#$(error Error reading $(BUILD_PROP))
+#endif
 
 # Extract version.release and version.codename from the build.prop file.
 # If either of the values aren't in the build.prop, the Make variables won't
 # be defined, and fallback handling will take place.
 #
-define newline
-
-
-endef
-$(eval $(subst #,$(newline),$(shell cat $(BUILD_PROP) | \
-        grep '^ro.build.version.release=\|^ro.build.version.codename=' | \
-        sed -e 's,ro.build.version.release=,PLATFORM_RELEASE=,' \
-            -e 's,ro.build.version.codename=,PLATFORM_CODENAME=,' | tr '\n' '#')))
+#define newline
+#
+#
+#endef
+#$(eval $(subst #,$(newline),$(shell cat $(BUILD_PROP) | \
+#       grep '^ro.build.version.release=\|^ro.build.version.codename=' | \
+#       sed -e 's,ro.build.version.release=,PLATFORM_RELEASE=,' \
+#           -e 's,ro.build.version.codename=,PLATFORM_CODENAME=,' | tr '\n' '#')))
 
 define release-starts-with
 $(shell echo $(PLATFORM_RELEASE) | grep -q ^$(1); \
diff --git a/jacinto6/ti-jacinto6-vendor.mk b/jacinto6/ti-jacinto6-vendor.mk
index 1bb1d16..534d095 100644
--- a/jacinto6/ti-jacinto6-vendor.mk
+++ b/jacinto6/ti-jacinto6-vendor.mk
@@ -17,4 +17,5 @@
 # the Texas Instruments OMAP 54xx series SoCs
 
 PRODUCT_PACKAGES += \
+        pvrsrvkm \
         ti_jacinto6_sgx_libs