summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2017-12-07 17:22:43 -0600
committerPraneeth Bajjuri2017-12-07 17:35:35 -0600
commitfd65e6d37241723bc6ef95ce5ecaaeedb2bad3e2 (patch)
treee8d9ee2825ee2f2b484bbe9aaf45df318682e049
parent86d145b73c81ad8580d243d11dacd310dec7a9f4 (diff)
downloaddevice-ti-proprietary-open-d-oreo-r6-core-k49-release.tar.gz
device-ti-proprietary-open-d-oreo-r6-core-k49-release.tar.xz
device-ti-proprietary-open-d-oreo-r6-core-k49-release.zip
Revert "jacinto6: sgx_src: build pvrsrv kernel module from source"d-oreo-r6-core-k49-release
This reverts commit e0dafca8fb5b8300049f0cf43730ba92a8ace4f7. Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> Conflicts: jacinto6/sgx.tgz Change-Id: Ife6c5ba255b8a8559e997a2c533eea6762c3d593
-rw-r--r--jacinto6/sgx.tgzbin1555721 -> 1672237 bytes
-rw-r--r--jacinto6/sgx/Android.mk30
-rw-r--r--jacinto6/sgx_src/Android.mk53
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk28
-rw-r--r--jacinto6/ti-jacinto6-vendor.mk1
5 files changed, 43 insertions, 69 deletions
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index 60e22c1..20eaee6 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
Binary files differ
diff --git a/jacinto6/sgx/Android.mk b/jacinto6/sgx/Android.mk
index bfb50e3..9d007ad 100644
--- a/jacinto6/sgx/Android.mk
+++ b/jacinto6/sgx/Android.mk
@@ -74,6 +74,26 @@ $$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
74 $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@ 74 $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
75endef 75endef
76 76
77define _add-sgx-vendor-km
78include $$(CLEAR_VARS)
79$(if $(word 2,$1),$(error Invalid SGX module name $1))
80LOCAL_MODULE := $(basename $(notdir $1))
81LOCAL_SRC_FILES := $1
82LOCAL_MODULE_TAGS := optional
83LOCAL_MODULE_SUFFIX := $(suffix $1)
84LOCAL_MODULE_CLASS := ETC
85LOCAL_MODULE_PATH := $$(TARGET_OUT)/lib/$(dir $1)
86LOCAL_STRIP_MODULE := false
87OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_ETC)
88LOCAL_PATH := $$(img-sgx.untarred_bin)
89include $$(BUILD_SYSTEM)/base_rules.mk
90$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
91$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
92 @echo "Copy $$@ <- $$(PRIVATE_SRC)"
93 @mkdir -p $$(dir $$@)
94 $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
95endef
96
77prebuilt_sgx_vendor_libs := \ 97prebuilt_sgx_vendor_libs := \
78 lib/libIMGegl.so \ 98 lib/libIMGegl.so \
79 lib/libglslcompiler.so \ 99 lib/libglslcompiler.so \
@@ -96,8 +116,11 @@ prebuilt_sgx_vendor_bins := \
96#prebuilt_sgx_vendor_etc := \ 116#prebuilt_sgx_vendor_etc := \
97# etc/powervr.ini 117# etc/powervr.ini
98 118
119prebuilt_sgx_vendor_km := \
120 modules/pvrsrvkm.ko
121
99prebuilt_sgx_modules := \ 122prebuilt_sgx_modules := \
100 $(foreach _file,$(prebuilt_sgx_vendor_libs) $(prebuilt_sgx_vendor_bins) $(prebuilt_sgx_vendor_etc),\ 123 $(foreach _file,$(prebuilt_sgx_vendor_libs) $(prebuilt_sgx_vendor_bins) $(prebuilt_sgx_vendor_etc) $(prebuilt_sgx_vendor_km),\
101 $(notdir $(basename $(_file)))) 124 $(notdir $(basename $(_file))))
102 125
103include $(CLEAR_VARS) 126include $(CLEAR_VARS)
@@ -115,10 +138,15 @@ $(foreach _file,$(prebuilt_sgx_vendor_bins),\
115$(foreach _file,$(prebuilt_sgx_vendor_etc),\ 138$(foreach _file,$(prebuilt_sgx_vendor_etc),\
116 $(eval $(call _add-sgx-vendor-etc,$(_file)))) 139 $(eval $(call _add-sgx-vendor-etc,$(_file))))
117 140
141$(foreach _file,$(prebuilt_sgx_vendor_km),\
142 $(eval $(call _add-sgx-vendor-km,$(_file))))
143
118prebuilt_sgx_modules := 144prebuilt_sgx_modules :=
119prebuilt_sgx_vendor_libs := 145prebuilt_sgx_vendor_libs :=
120prebuilt_sgx_vendor_bins := 146prebuilt_sgx_vendor_bins :=
121prebuilt_sgx_vendor_etc := 147prebuilt_sgx_vendor_etc :=
148prebuilt_sgx_vendor_km :=
122_add-sgx-vendor-lib := 149_add-sgx-vendor-lib :=
123_add-sgx-vendor-bin := 150_add-sgx-vendor-bin :=
124_add-sgx-vendor-etc := 151_add-sgx-vendor-etc :=
152_add-sgx-vendor-km :=
diff --git a/jacinto6/sgx_src/Android.mk b/jacinto6/sgx_src/Android.mk
deleted file mode 100644
index 663404c..0000000
--- a/jacinto6/sgx_src/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
1# Copyright (C) 2011 The Android Open Source Project
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14#
15
16LOCAL_PATH := $(call my-dir)
17include $(CLEAR_VARS)
18
19MODULE_TARGET := pvrsrvkm.ko
20LOCAL_MODULE := $(basename $(MODULE_TARGET))
21LOCAL_MODULE_SUFFIX := $(suffix $(MODULE_TARGET))
22LOCAL_MODULE_CLASS := ETC
23
24local-build := $(LOCAL_PATH)/eurasia_km/eurasiacon/build/linux2/omap_android
25out-intermediates := $(call intermediates-dir-for, ETC, $(LOCAL_MODULE))
26
27PVRSRVKM := $(LOCAL_PATH)/$(MODULE_TARGET)
28
29$(PVRSRVKM): $(local-build)/Makefile $(KERNELDIR)/.version
30 @echo "Building $@"
31 @$(MAKE) -f Makefile -C $(local-build) \
32 CROSS_COMPILE=arm-linux-androideabi- \
33 KERNEL_CROSS_COMPILE=arm-linux-androideabi- \
34 KERNELDIR=$(KERNELDIR) \
35 ARCH=arm \
36 ANDROID_ROOT=$(ANDROID_BUILD_TOP) \
37 PLATFORM_RELEASE="8.0" \
38 OUT=$(ANDROID_BUILD_TOP)/$(out-intermediates)
39 @$(ACP) -fp $(ANDROID_BUILD_TOP)/$(out-intermediates)/target/$(MODULE_TARGET) $@
40 @echo "Finished building $@"
41
42GEN := $(out-intermediates)/$(MODULE_TARGET)
43$(GEN): $(PVRSRVKM)
44 @echo "Copying $@ <- $<"
45 $(copy-file-to-target)
46
47LOCAL_MODULE_TAGS := optional
48LOCAL_SRC_FILES := $(MODULE_TARGET)
49LOCAL_GENERATED_SOURCES += $(GEN)
50LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/modules
51LOCAL_STRIP_MODULE := false
52BOARD_VENDOR_KERNEL_MODULES += $(PVRSRVKM)
53include $(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 b99d976..f2a5600 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 @@
41# If there's no build.prop file in the expected location, bail out. Tell the 41# If there's no build.prop file in the expected location, bail out. Tell the
42# user which file we were trying to read in case TARGET_DEVICE was not set. 42# user which file we were trying to read in case TARGET_DEVICE was not set.
43# 43#
44#BUILD_PROP := $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/build.prop 44BUILD_PROP := $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/build.prop
45#ifeq ($(wildcard $(BUILD_PROP)),) 45ifeq ($(wildcard $(BUILD_PROP)),)
46#$(warning *** Could not determine Android version. Did you set ANDROID_ROOT,\ 46$(warning *** Could not determine Android version. Did you set ANDROID_ROOT,\
47#OUT_DIR and TARGET_DEVICE in your environment correctly?) 47OUT_DIR and TARGET_DEVICE in your environment correctly?)
48#$(error Error reading $(BUILD_PROP)) 48$(error Error reading $(BUILD_PROP))
49#endif 49endif
50 50
51# Extract version.release and version.codename from the build.prop file. 51# Extract version.release and version.codename from the build.prop file.
52# If either of the values aren't in the build.prop, the Make variables won't 52# If either of the values aren't in the build.prop, the Make variables won't
53# be defined, and fallback handling will take place. 53# be defined, and fallback handling will take place.
54# 54#
55#define newline 55define newline
56# 56
57# 57
58#endef 58endef
59#$(eval $(subst #,$(newline),$(shell cat $(BUILD_PROP) | \ 59$(eval $(subst #,$(newline),$(shell cat $(BUILD_PROP) | \
60# grep '^ro.build.version.release=\|^ro.build.version.codename=' | \ 60 grep '^ro.build.version.release=\|^ro.build.version.codename=' | \
61# sed -e 's,ro.build.version.release=,PLATFORM_RELEASE=,' \ 61 sed -e 's,ro.build.version.release=,PLATFORM_RELEASE=,' \
62# -e 's,ro.build.version.codename=,PLATFORM_CODENAME=,' | tr '\n' '#'))) 62 -e 's,ro.build.version.codename=,PLATFORM_CODENAME=,' | tr '\n' '#')))
63 63
64define release-starts-with 64define release-starts-with
65$(shell echo $(PLATFORM_RELEASE) | grep -q ^$(1); \ 65$(shell echo $(PLATFORM_RELEASE) | grep -q ^$(1); \
diff --git a/jacinto6/ti-jacinto6-vendor.mk b/jacinto6/ti-jacinto6-vendor.mk
index 534d095..1bb1d16 100644
--- a/jacinto6/ti-jacinto6-vendor.mk
+++ b/jacinto6/ti-jacinto6-vendor.mk
@@ -17,5 +17,4 @@
17# the Texas Instruments OMAP 54xx series SoCs 17# the Texas Instruments OMAP 54xx series SoCs
18 18
19PRODUCT_PACKAGES += \ 19PRODUCT_PACKAGES += \
20 pvrsrvkm \
21 ti_jacinto6_sgx_libs 20 ti_jacinto6_sgx_libs