summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2017-02-28 23:53:04 -0600
committerPraneeth Bajjuri2017-02-28 23:53:04 -0600
commitf04030696c85adf4c5f34f78e39a55bf3b1b617e (patch)
tree6ddaef07780f47ff2a16ae02c2c0fcb9bb391669
parentb0c95b7a743d7d39c0ad29f48496ef1a6b92647c (diff)
parent468a90d5a6cfd0dc46f296452c55b03d00de54ed (diff)
downloaddevice-ti-proprietary-open-d-nougat-release-test.tar.gz
device-ti-proprietary-open-d-nougat-release-test.tar.xz
device-ti-proprietary-open-d-nougat-release-test.zip
Merge branch 'd-marshmallow-mr3-release' into d-nougat-released-nougat-release-test
* 'd-marshmallow-mr3-release' of /home/praneeth/omapzoom/proprietary-open/: sgx: 4.9 test patch earlyboot: remove warnings in pvr build jacinto6: update ipu2 binary km: Makefile: fix am57xevm target typo jacinto6: sgx-bin: sgx binaries update jacinto6: update SGX kernel module for latest kernel jacinto6: update SGX kernel module for latest kernel SGX: README: update instructions with new toolchain jacinto6: sgx-bin: bins and src update jacinto6: update SGX kernel module for latest kernel dra71-evm: Add touch firmware jacinto6: update SGX kernel module for latest kernel jacinto6: update SGX kernel module for latest kernel Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> Conflicts: jacinto6/sgx.tgz
-rw-r--r--Android.mk29
-rw-r--r--jacinto6/LICENCE.Spectrum-GT927130
-rw-r--r--jacinto6/README.SGX13
-rw-r--r--jacinto6/ducati_full_jacinto6evm.tgzbin1532632 -> 1635997 bytes
-rw-r--r--jacinto6/sgx.tgzbin1682475 -> 1666651 bytes
-rw-r--r--jacinto6/sgx/Android.mk152
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk58
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk4
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile7
-rw-r--r--jacinto6/sgx_src/eurasia_km/include4/pvrversion.h10
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c35
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/mmap.c3
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/osfunc.c4
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_drm.c12
-rw-r--r--jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk2
-rw-r--r--jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/dbgdriv_handle.c (renamed from jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/handle.c)0
-rw-r--r--jacinto6/touch-full_jacinto6evm.mk24
-rw-r--r--jacinto6/touch_full_jacinto6evm.tgzbin0 -> 1151 bytes
18 files changed, 155 insertions, 228 deletions
diff --git a/Android.mk b/Android.mk
index 12fc0f3..d481147 100644
--- a/Android.mk
+++ b/Android.mk
@@ -42,6 +42,35 @@ endif
42############################################# 42#############################################
43 43
44############################################# 44#############################################
45# Install J6Entry touch firmware
46#############################################
47ifneq ($(TOUCH_TGZ),)
48ti-touch.untarred_intermediates := $(call intermediates-dir-for, FAKE, ti-touch.untarred)
49ti-touch.untarred_timestamp := $(ti-touch.untarred_intermediates)/stamp
50
51$(ti-touch.untarred_timestamp) : $(TOUCH_TGZ)
52 @echo "Unzip $(dir $@) <- $<)"
53 $(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
54 $(hide) tar -C $(dir $@) -zxf $<
55 $(hide) touch $@
56
57include $(CLEAR_VARS)
58LOCAL_MODULE := $(TOUCH_BINARY)
59LOCAL_MODULE_CLASS := FAKE
60LOCAL_MODULE_TAGS := optional
61LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
62
63include $(BUILD_SYSTEM)/base_rules.mk
64
65$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(ti-touch.untarred_intermediates)/$(TOUCH_BINARY)
66$(LOCAL_BUILT_MODULE) : $(ti-touch.untarred_timestamp) | $(ACP)
67 @echo "Copy $@ <- $(PRIVATE_SRC)"
68 @mkdir -p $(dir $@)
69 $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
70endif
71#############################################
72
73#############################################
45# Install Tesla-binary FW 74# Install Tesla-binary FW
46############################################# 75#############################################
47 76
diff --git a/jacinto6/LICENCE.Spectrum-GT9271 b/jacinto6/LICENCE.Spectrum-GT9271
new file mode 100644
index 0000000..ef319c4
--- /dev/null
+++ b/jacinto6/LICENCE.Spectrum-GT9271
@@ -0,0 +1,30 @@
1Copyright (c) 2016, Spectrum Digital Incorporated
2
3All rights reserved.
4
5Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met:
7
81. Redistributions of source code must retain the above copyright notice,
9this list of conditions and the following disclaimer.
10
112. Redistributions in binary form must reproduce the above copyright notice,
12this list of conditions and the following disclaimer in the documentation
13and/or other materials provided with the distribution.
14
153. Neither the name of the copyright holder nor the names of its contributors
16may be used to endorse or promote products derived from this software without
17specific prior written permission.
18
19DISCLAIMER.
20
21THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
22AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
25LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
27GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
30OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX
index ce68344..ad64515 100644
--- a/jacinto6/README.SGX
+++ b/jacinto6/README.SGX
@@ -14,11 +14,11 @@
14sgx.tgz a set of binaries built for SGX544. 14sgx.tgz a set of binaries built for SGX544.
15 15
16[DDK Version] 16[DDK Version]
17 1.14/4001660 17 1.14/4081762
18[DDK commit ID] 18[DDK commit ID]
19 3ed372b um: gralloc: change stride alignment to 16 pixels 19 2a3afec gralloc: Dont translate formats on video encoder usage
20[Branch] 20[Branch]
21 android/1.14/4001660_k4.4_M 21 android/1.14/4081762_k4.4_M
22[Kernel modules built against] 22[Kernel modules built against]
23 Kernel Version: 4.4.y with CONFIG_MODVERSIONS=y 23 Kernel Version: 4.4.y with CONFIG_MODVERSIONS=y
24[Build type] 24[Build type]
@@ -34,13 +34,14 @@ Make sure kernel is built before building modules
34# cd ANDROID_ROOT/device/ti/proprietary-open/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/ 34# cd ANDROID_ROOT/device/ti/proprietary-open/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/
35# export ANDROID_ROOT=path_to_android_fs_source 35# export ANDROID_ROOT=path_to_android_fs_source
36# export KERNELDIR=path_to_kernel_source 36# export KERNELDIR=path_to_kernel_source
37# export CROSS_COMPILE=$ANDROID_ROOT/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi- 37# export CROSS_COMPILE=$ANDROID_ROOT/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-
38# export KERNEL_CROSS_COMPILE==$ANDROID_ROOT/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi- 38# export KERNEL_CROSS_COMPILE=$ANDROID_ROOT/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-
39# export ARCH=arm 39# export ARCH=arm
40# export PATH=<path to kernel toolchain>:$PATH 40# export PATH=<path to kernel toolchain>:$PATH
41 41
42To build for Jacinto6 (SGX 544 multi core): 42To build for Jacinto6/AM57x (SGX 544 multi core):
43# make TARGET_PRODUCT="jacinto6evm" BUILD=release 43# make TARGET_PRODUCT="jacinto6evm" BUILD=release
44# make TARGET_PRODUCT="am57xevm" BUILD=release
44 45
45Once the .ko is built, install it onto device (/system/lib/modules) 46Once the .ko is built, install it onto device (/system/lib/modules)
46 47
diff --git a/jacinto6/ducati_full_jacinto6evm.tgz b/jacinto6/ducati_full_jacinto6evm.tgz
index 71b540f..2cb5680 100644
--- a/jacinto6/ducati_full_jacinto6evm.tgz
+++ b/jacinto6/ducati_full_jacinto6evm.tgz
Binary files differ
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index 8664309..f30df9e 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
Binary files differ
diff --git a/jacinto6/sgx/Android.mk b/jacinto6/sgx/Android.mk
deleted file mode 100644
index 9d007ad..0000000
--- a/jacinto6/sgx/Android.mk
+++ /dev/null
@@ -1,152 +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
16define _add-sgx-vendor-lib
17include $$(CLEAR_VARS)
18$(if $(word 2,$1),$(error Invalid SGX module name $1))
19LOCAL_MODULE := $(basename $(notdir $1))
20LOCAL_SRC_FILES := $1
21LOCAL_MODULE_TAGS := optional
22LOCAL_MODULE_SUFFIX := $(suffix $1)
23LOCAL_MODULE_CLASS := SHARED_LIBRARIES
24LOCAL_MODULE_PATH := $$(TARGET_OUT_VENDOR)/$(dir $1)
25LOCAL_STRIP_MODULE := false
26OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)
27LOCAL_PATH := $$(img-sgx.untarred_bin)
28include $$(BUILD_SYSTEM)/base_rules.mk
29$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
30$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
31 $(eval FIXED_SRC := $$(img-sgx.untarred_bin)/$(subst $(TARGET_BOARD_PLATFORM),jacinto6,$1))
32 @echo "Copy $$@ <- $(FIXED_SRC)"
33 @mkdir -p $(dir $$@)
34 $$(hide) $$(ACP) -fp $(FIXED_SRC) $$@
35endef
36
37define _add-sgx-vendor-bin
38include $$(CLEAR_VARS)
39$(if $(word 2,$1),$(error Invalid SGX module name $1))
40LOCAL_MODULE := $(basename $(notdir $1))
41LOCAL_SRC_FILES := $1
42LOCAL_MODULE_TAGS := optional
43LOCAL_MODULE_SUFFIX := $(suffix $1)
44LOCAL_MODULE_CLASS := EXECUTABLES
45LOCAL_MODULE_PATH := $$(TARGET_OUT_VENDOR)/$(dir $1)
46LOCAL_STRIP_MODULE := false
47OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_EXECUTABLES)
48LOCAL_PATH := $$(img-sgx.untarred_bin)
49include $$(BUILD_SYSTEM)/base_rules.mk
50$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
51$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
52 @echo "Copy $$@ <- $$(PRIVATE_SRC)"
53 @mkdir -p $$(dir $$@)
54 $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
55endef
56
57define _add-sgx-vendor-etc
58include $$(CLEAR_VARS)
59$(if $(word 2,$1),$(error Invalid SGX module name $1))
60LOCAL_MODULE := $(basename $(notdir $1))
61LOCAL_SRC_FILES := $1
62LOCAL_MODULE_TAGS := optional
63LOCAL_MODULE_SUFFIX := $(suffix $1)
64LOCAL_MODULE_CLASS := ETC
65LOCAL_MODULE_PATH := $$(TARGET_OUT)/$(dir $1)
66LOCAL_STRIP_MODULE := false
67OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_ETC)
68LOCAL_PATH := $$(img-sgx.untarred_bin)
69include $$(BUILD_SYSTEM)/base_rules.mk
70$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
71$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
72 @echo "Copy $$@ <- $$(PRIVATE_SRC)"
73 @mkdir -p $$(dir $$@)
74 $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
75endef
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
97prebuilt_sgx_vendor_libs := \
98 lib/libIMGegl.so \
99 lib/libglslcompiler.so \
100 lib/libusc.so \
101 lib/libPVRScopeServices.so \
102 lib/libsrv_um.so \
103 lib/hw/gralloc.$(TARGET_BOARD_PLATFORM).so \
104 lib/hw/memtrack.$(TARGET_BOARD_PLATFORM).so \
105 lib/libpvrANDROID_WSEGL.so \
106 lib/libpvr2d.so \
107 lib/libsrv_init.so \
108 lib/egl/libGLESv1_CM_POWERVR_SGX544_116.so \
109 lib/egl/libGLESv2_POWERVR_SGX544_116.so \
110 lib/egl/libEGL_POWERVR_SGX544_116.so
111
112prebuilt_sgx_vendor_bins := \
113 bin/pvrsrvinit \
114 bin/pvrsrvctl
115
116#prebuilt_sgx_vendor_etc := \
117# etc/powervr.ini
118
119prebuilt_sgx_vendor_km := \
120 modules/pvrsrvkm.ko
121
122prebuilt_sgx_modules := \
123 $(foreach _file,$(prebuilt_sgx_vendor_libs) $(prebuilt_sgx_vendor_bins) $(prebuilt_sgx_vendor_etc) $(prebuilt_sgx_vendor_km),\
124 $(notdir $(basename $(_file))))
125
126include $(CLEAR_VARS)
127LOCAL_MODULE := ti_jacinto6_sgx_libs
128LOCAL_MODULE_TAGS := optional
129LOCAL_REQUIRED_MODULES := $(prebuilt_sgx_modules)
130include $(BUILD_PHONY_PACKAGE)
131
132$(foreach _file,$(prebuilt_sgx_vendor_libs),\
133 $(eval $(call _add-sgx-vendor-lib,$(_file))))
134
135$(foreach _file,$(prebuilt_sgx_vendor_bins),\
136 $(eval $(call _add-sgx-vendor-bin,$(_file))))
137
138$(foreach _file,$(prebuilt_sgx_vendor_etc),\
139 $(eval $(call _add-sgx-vendor-etc,$(_file))))
140
141$(foreach _file,$(prebuilt_sgx_vendor_km),\
142 $(eval $(call _add-sgx-vendor-km,$(_file))))
143
144prebuilt_sgx_modules :=
145prebuilt_sgx_vendor_libs :=
146prebuilt_sgx_vendor_bins :=
147prebuilt_sgx_vendor_etc :=
148prebuilt_sgx_vendor_km :=
149_add-sgx-vendor-lib :=
150_add-sgx-vendor-bin :=
151_add-sgx-vendor-etc :=
152_add-sgx-vendor-km :=
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
index b93243b..9b49915 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
@@ -48,13 +48,14 @@
48 48
49# These flags are used for kernel, User C and User C++ 49# These flags are used for kernel, User C and User C++
50# 50#
51COMMON_FLAGS := -W -Wall 51# COMMON_FLAGS := -W
52#-Wall
52 53
53# Some GCC warnings are C only, so we must mask them from C++ 54# Some GCC warnings are C only, so we must mask them from C++
54# 55#
55COMMON_CFLAGS := $(COMMON_FLAGS) \ 56#COMMON_CFLAGS := $(COMMON_FLAGS) \
56 -Wdeclaration-after-statement -Wno-format-zero-length \ 57# -Wdeclaration-after-statement -Wno-format-zero-length \
57 -Wstrict-prototypes 58# -Wstrict-prototypes
58 59
59# User C and User C++ optimization control. Does not affect kernel. 60# User C and User C++ optimization control. Does not affect kernel.
60# 61#
@@ -71,7 +72,7 @@ endif
71 72
72# FIXME: We should probably audit the driver for aliasing 73# FIXME: We should probably audit the driver for aliasing
73# 74#
74COMMON_USER_FLAGS += -fno-strict-aliasing 75#COMMON_USER_FLAGS += -fno-strict-aliasing
75 76
76# We always enable debugging. Either the release binaries are stripped 77# We always enable debugging. Either the release binaries are stripped
77# and the symbols put in the symbolpackage, or we're building debug. 78# and the symbols put in the symbolpackage, or we're building debug.
@@ -80,9 +81,9 @@ COMMON_USER_FLAGS += -g $(ANDROID_FPGA_FORCE_32BIT)
80 81
81# User C and User C++ warning flags 82# User C and User C++ warning flags
82# 83#
83COMMON_USER_FLAGS += \ 84#COMMON_USER_FLAGS += \
84 -Wpointer-arith -Wunused-parameter \ 85# -Wpointer-arith -Wunused-parameter \
85 -Wmissing-format-attribute 86# -Wmissing-format-attribute
86 87
87# Additional warnings, and optional warnings. 88# Additional warnings, and optional warnings.
88# 89#
@@ -158,36 +159,11 @@ TESTED_TARGET_USER_FLAGS += \
158TESTED_HOST_USER_FLAGS += \ 159TESTED_HOST_USER_FLAGS += \
159 $(call host-cc-optional-warning,-Wunused-but-set-variable) 160 $(call host-cc-optional-warning,-Wunused-but-set-variable)
160 161
161KBUILD_FLAGS := \ 162#KBUILD_FLAGS := \
162 -Wno-unused-parameter -Wno-sign-compare 163# -Wno-unused-parameter -Wno-sign-compare
163 164
164TESTED_KBUILD_FLAGS := \ 165# androideabi toolchain adds `pic` by default, disable it
165 $(call kernel-cc-option,-Wmissing-include-dirs) \ 166# for kernel module build
166 $(call kernel-cc-option,-Wno-type-limits) \
167 $(call kernel-cc-option,-Wno-pointer-arith) \
168 $(call kernel-cc-option,-Wno-aggregate-return) \
169 $(call kernel-cc-option,-Wno-unused-but-set-variable) \
170 $(call kernel-cc-option,-Wno-old-style-declaration) \
171 $(call kernel-cc-optional-warning,-Wbad-function-cast) \
172 $(call kernel-cc-optional-warning,-Wcast-qual) \
173 $(call kernel-cc-optional-warning,-Wcast-align) \
174 $(call kernel-cc-optional-warning,-Wconversion) \
175 $(call kernel-cc-optional-warning,-Wdisabled-optimization) \
176 $(call kernel-cc-optional-warning,-Wlogical-op) \
177 $(call kernel-cc-optional-warning,-Wmissing-declarations) \
178 $(call kernel-cc-optional-warning,-Wmissing-include-dirs) \
179 $(call kernel-cc-optional-warning,-Wnested-externs) \
180 $(call kernel-cc-optional-warning,-Wno-missing-field-initializers) \
181 $(call kernel-cc-optional-warning,-Wold-style-definition) \
182 $(call kernel-cc-optional-warning,-Woverlength-strings) \
183 $(call kernel-cc-optional-warning,-Wpacked) \
184 $(call kernel-cc-optional-warning,-Wpacked-bitfield-compat) \
185 $(call kernel-cc-optional-warning,-Wpadded) \
186 $(call kernel-cc-optional-warning,-Wredundant-decls) \
187 $(call kernel-cc-optional-warning,-Wshadow) \
188 $(call kernel-cc-optional-warning,-Wswitch-default) \
189 $(call kernel-cc-optional-warning,-Wvla) \
190 $(call kernel-cc-optional-warning,-Wwrite-strings)
191 167
192# User C only 168# User C only
193# 169#
@@ -199,12 +175,12 @@ ALL_HOST_CFLAGS := \
199 175
200# User C++ only 176# User C++ only
201# 177#
202ALL_CXXFLAGS := \ 178#ALL_CXXFLAGS := \
203 -fno-rtti -fno-exceptions \ 179# -fno-rtti -fno-exceptions \
204 $(COMMON_USER_FLAGS) $(COMMON_FLAGS) $(TESTED_TARGET_USER_FLAGS) \ 180 $(COMMON_USER_FLAGS) $(COMMON_FLAGS) $(TESTED_TARGET_USER_FLAGS) \
205 $(SYS_CXXFLAGS) 181 $(SYS_CXXFLAGS)
206ALL_HOST_CXXFLAGS := \ 182#ALL_HOST_CXXFLAGS := \
207 -fno-rtti -fno-exceptions \ 183# -fno-rtti -fno-exceptions \
208 $(COMMON_USER_FLAGS) $(COMMON_FLAGS) $(TESTED_HOST_USER_FLAGS) 184 $(COMMON_USER_FLAGS) $(COMMON_FLAGS) $(TESTED_HOST_USER_FLAGS)
209 185
210# Workaround for some target clangs that don't support -O0 w/ PIC. 186# Workaround for some target clangs that don't support -O0 w/ PIC.
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
index 68e8132..ba37064 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
@@ -245,8 +245,8 @@ PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_RAWxx := 1
245endif 245endif
246 246
247############################################################################## 247##############################################################################
248# Marshmallow onwards DDK stopped render script accleration using GPU. 248# Marshmallow onwards DDK stopped render script acceleration using GPU.
249# This flag stops device alloction. 249# This flag stops device allocation.
250# 250#
251ifeq ($(is_at_least_marshmallow),1) 251ifeq ($(is_at_least_marshmallow),1)
252PVR_ANDROID_HAS_GRALLOC_USAGE_RENDERSCRIPT := 1 252PVR_ANDROID_HAS_GRALLOC_USAGE_RENDERSCRIPT := 1
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
index 046b8bb..082cd79 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
@@ -51,10 +51,6 @@ ifeq ($(TARGET_DEVICE),)
51override TARGET_DEVICE := jacinto6evm 51override TARGET_DEVICE := jacinto6evm
52endif 52endif
53 53
54ifeq ($(TARGET_DEVICE),)
55override TARGET_DEVICE := am57xevm
56endif
57
58# Customize this build as per the TARGET_DEVICE setting 54# Customize this build as per the TARGET_DEVICE setting
59# 55#
60ifneq ($(filter blaze blaze_tablet panda tuna maguro toro mysid yakju,$(TARGET_DEVICE)),) 56ifneq ($(filter blaze blaze_tablet panda tuna maguro toro mysid yakju,$(TARGET_DEVICE)),)
@@ -99,8 +95,7 @@ SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
99endif 95endif
100 96
101ifneq ($(filter am57xevm,$(TARGET_DEVICE)),) 97ifneq ($(filter am57xevm,$(TARGET_DEVICE)),)
102HAL_VARIANT := am57x 98HAL_VARIANT := am57xevm
103
104endif 99endif
105 100
106# Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs 101# Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs
diff --git a/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h b/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h
index d48838f..bc0d8cc 100644
--- a/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h
+++ b/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h
@@ -53,16 +53,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
53 53
54#define PVRVERSION_FAMILY "sgxddk" 54#define PVRVERSION_FAMILY "sgxddk"
55#define PVRVERSION_BRANCHNAME "1.14" 55#define PVRVERSION_BRANCHNAME "1.14"
56#define PVRVERSION_BUILD 4001660 56#define PVRVERSION_BUILD 4081762
57#define PVRVERSION_BSCONTROL "SGX_DDK_Linux_XOrg" 57#define PVRVERSION_BSCONTROL "SGX_DDK_Android"
58 58
59#define PVRVERSION_STRING "SGX_DDK_Linux_XOrg sgxddk 1.14@" PVR_STR2(PVRVERSION_BUILD) 59#define PVRVERSION_STRING "SGX_DDK_Android sgxddk 1.14@" PVR_STR2(PVRVERSION_BUILD)
60#define PVRVERSION_STRING_SHORT "1.14@" PVR_STR2(PVRVERSION_BUILD) "" 60#define PVRVERSION_STRING_SHORT "1.14@" PVR_STR2(PVRVERSION_BUILD) ""
61 61
62#define COPYRIGHT_TXT "Copyright (c) Imagination Technologies Ltd. All Rights Reserved." 62#define COPYRIGHT_TXT "Copyright (c) Imagination Technologies Ltd. All Rights Reserved."
63 63
64#define PVRVERSION_BUILD_HI 400 64#define PVRVERSION_BUILD_HI 408
65#define PVRVERSION_BUILD_LO 1660 65#define PVRVERSION_BUILD_LO 1762
66#define PVRVERSION_STRING_NUMERIC PVR_STR2(PVRVERSION_MAJ) "." PVR_STR2(PVRVERSION_MIN) "." PVR_STR2(PVRVERSION_BUILD_HI) "." PVR_STR2(PVRVERSION_BUILD_LO) 66#define PVRVERSION_STRING_NUMERIC PVR_STR2(PVRVERSION_MAJ) "." PVR_STR2(PVRVERSION_MIN) "." PVR_STR2(PVRVERSION_BUILD_HI) "." PVR_STR2(PVRVERSION_BUILD_LO)
67 67
68#endif /* _PVRVERSION_H_ */ 68#endif /* _PVRVERSION_H_ */
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c
index bce7945..6ca6bc2 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c
@@ -1100,6 +1100,7 @@ IMG_HANDLE SGXRegisterHWRenderContextKM(IMG_HANDLE hDeviceNode,
1100 IMG_UINT8 *pDst; 1100 IMG_UINT8 *pDst;
1101 PRESMAN_ITEM psResItem; 1101 PRESMAN_ITEM psResItem;
1102 IMG_UINT32 ui32PDDevPAddrInDirListFormat; 1102 IMG_UINT32 ui32PDDevPAddrInDirListFormat;
1103 IMG_UINT8 *pStartPDDevPAddr, *pEndPDDevPAddr;
1103 1104
1104 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP, 1105 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
1105 sizeof(SGX_HW_RENDER_CONTEXT_CLEANUP), 1106 sizeof(SGX_HW_RENDER_CONTEXT_CLEANUP),
@@ -1135,6 +1136,16 @@ IMG_HANDLE SGXRegisterHWRenderContextKM(IMG_HANDLE hDeviceNode,
1135 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWRenderContextKM: Couldn't allocate device memory for HW Render Context")); 1136 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWRenderContextKM: Couldn't allocate device memory for HW Render Context"));
1136 goto exit1; 1137 goto exit1;
1137 } 1138 }
1139 /* Ensure that the offset of Page directory dev physical address field is within the allocated context memory */
1140 pStartPDDevPAddr = (IMG_UINT8 *)(psCleanup->psHWRenderContextMemInfo->pvLinAddrKM) + ui32OffsetToPDDevPAddr;
1141 pEndPDDevPAddr = pStartPDDevPAddr + sizeof(ui32PDDevPAddrInDirListFormat) - 1;
1142
1143 if (pStartPDDevPAddr < (IMG_UINT8 *)psCleanup->psHWRenderContextMemInfo->pvLinAddrKM ||
1144 pEndPDDevPAddr >= (IMG_UINT8 *)(psCleanup->psHWRenderContextMemInfo->pvLinAddrKM) + ui32HWRenderContextSize)
1145 {
1146 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWRenderContextKM: Offset of page directory device physical address is invalid"));
1147 goto exit2;
1148 }
1138 1149
1139 eError = OSCopyFromUser(psPerProc, 1150 eError = OSCopyFromUser(psPerProc,
1140 psCleanup->psHWRenderContextMemInfo->pvLinAddrKM, 1151 psCleanup->psHWRenderContextMemInfo->pvLinAddrKM,
@@ -1287,6 +1298,7 @@ IMG_HANDLE SGXRegisterHWTransferContextKM(IMG_HANDLE hDeviceNode,
1287 IMG_UINT8 *pDst; 1298 IMG_UINT8 *pDst;
1288 PRESMAN_ITEM psResItem; 1299 PRESMAN_ITEM psResItem;
1289 IMG_UINT32 ui32PDDevPAddrInDirListFormat; 1300 IMG_UINT32 ui32PDDevPAddrInDirListFormat;
1301 IMG_UINT8 *pStartPDDevPAddr, *pEndPDDevPAddr;
1290 1302
1291 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP, 1303 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
1292 sizeof(SGX_HW_TRANSFER_CONTEXT_CLEANUP), 1304 sizeof(SGX_HW_TRANSFER_CONTEXT_CLEANUP),
@@ -1324,6 +1336,17 @@ IMG_HANDLE SGXRegisterHWTransferContextKM(IMG_HANDLE hDeviceNode,
1324 goto exit1; 1336 goto exit1;
1325 } 1337 }
1326 1338
1339 /* Ensure that the offset of Page directory dev physical address field is within the allocated context memory */
1340 pStartPDDevPAddr = (IMG_UINT8 *)(psCleanup->psHWTransferContextMemInfo->pvLinAddrKM) + ui32OffsetToPDDevPAddr;
1341 pEndPDDevPAddr = pStartPDDevPAddr + sizeof(ui32PDDevPAddrInDirListFormat) - 1;
1342
1343 if (pStartPDDevPAddr < (IMG_UINT8 *)psCleanup->psHWTransferContextMemInfo->pvLinAddrKM ||
1344 pEndPDDevPAddr >= (IMG_UINT8 *)(psCleanup->psHWTransferContextMemInfo->pvLinAddrKM) + ui32HWTransferContextSize)
1345 {
1346 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWTransferContextKM: Offset of page directory device physical address is invalid"));
1347 goto exit2;
1348 }
1349
1327 eError = OSCopyFromUser(psPerProc, 1350 eError = OSCopyFromUser(psPerProc,
1328 psCleanup->psHWTransferContextMemInfo->pvLinAddrKM, 1351 psCleanup->psHWTransferContextMemInfo->pvLinAddrKM,
1329 psHWTransferContextCpuVAddr, 1352 psHWTransferContextCpuVAddr,
@@ -1628,6 +1651,7 @@ IMG_HANDLE SGXRegisterHW2DContextKM(IMG_HANDLE hDeviceNode,
1628 IMG_UINT8 *pDst; 1651 IMG_UINT8 *pDst;
1629 PRESMAN_ITEM psResItem; 1652 PRESMAN_ITEM psResItem;
1630 IMG_UINT32 ui32PDDevPAddrInDirListFormat; 1653 IMG_UINT32 ui32PDDevPAddrInDirListFormat;
1654 IMG_UINT8 *pStartPDDevPAddr, *pEndPDDevPAddr;
1631 1655
1632 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP, 1656 eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
1633 sizeof(SGX_HW_2D_CONTEXT_CLEANUP), 1657 sizeof(SGX_HW_2D_CONTEXT_CLEANUP),
@@ -1664,6 +1688,17 @@ IMG_HANDLE SGXRegisterHW2DContextKM(IMG_HANDLE hDeviceNode,
1664 goto exit1; 1688 goto exit1;
1665 } 1689 }
1666 1690
1691 /* Ensure that the offset of Page directory dev physical address field is within the allocated context memory */
1692 pStartPDDevPAddr = (IMG_UINT8 *)(psCleanup->psHW2DContextMemInfo->pvLinAddrKM) + ui32OffsetToPDDevPAddr;
1693 pEndPDDevPAddr = pStartPDDevPAddr + sizeof(ui32PDDevPAddrInDirListFormat) - 1;
1694
1695 if (pStartPDDevPAddr < (IMG_UINT8 *)psCleanup->psHW2DContextMemInfo->pvLinAddrKM ||
1696 pEndPDDevPAddr >= (IMG_UINT8 *)(psCleanup->psHW2DContextMemInfo->pvLinAddrKM) + ui32HW2DContextSize)
1697 {
1698 PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWTransferContextKM: Offset of page directory device physical address is invalid"));
1699 goto exit2;
1700 }
1701
1667 eError = OSCopyFromUser(psPerProc, 1702 eError = OSCopyFromUser(psPerProc,
1668 psCleanup->psHW2DContextMemInfo->pvLinAddrKM, 1703 psCleanup->psHW2DContextMemInfo->pvLinAddrKM,
1669 psHW2DContextCpuVAddr, 1704 psHW2DContextCpuVAddr,
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/mmap.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/mmap.c
index e7fb667..a20f876 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/mmap.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/mmap.c
@@ -48,6 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
48#endif 48#endif
49 49
50#include <linux/mm.h> 50#include <linux/mm.h>
51#include <linux/pfn_t.h>
51#include <linux/module.h> 52#include <linux/module.h>
52#include <linux/vmalloc.h> 53#include <linux/vmalloc.h>
53#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) 54#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
@@ -787,7 +788,7 @@ DoMapToUser(LinuxMemArea *psLinuxMemArea,
787#if defined(PVR_MAKE_ALL_PFNS_SPECIAL) 788#if defined(PVR_MAKE_ALL_PFNS_SPECIAL)
788 if (bMixedMap) 789 if (bMixedMap)
789 { 790 {
790 result = vm_insert_mixed(ps_vma, ulVMAPos, pfn); 791 result = vm_insert_mixed(ps_vma, ulVMAPos, pfn_to_pfn_t(pfn));
791 if(result != 0) 792 if(result != 0)
792 { 793 {
793 PVR_DPF((PVR_DBG_ERROR,"%s: Error - vm_insert_mixed failed (%d)", __FUNCTION__, result)); 794 PVR_DPF((PVR_DBG_ERROR,"%s: Error - vm_insert_mixed failed (%d)", __FUNCTION__, result));
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/osfunc.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/osfunc.c
index 1302edb..81b9985 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/osfunc.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/osfunc.c
@@ -3547,7 +3547,7 @@ PVRSRV_ERROR OSReleasePhysPageAddr(IMG_HANDLE hOSWrapMem)
3547 SetPageDirty(psPage); 3547 SetPageDirty(psPage);
3548 } 3548 }
3549 } 3549 }
3550 page_cache_release(psPage); 3550 put_page(psPage);
3551 } 3551 }
3552 break; 3552 break;
3553 } 3553 }
@@ -3729,7 +3729,7 @@ PVRSRV_ERROR OSAcquirePhysPageAddr(IMG_VOID *pvCPUVAddr,
3729 bMMapSemHeld = IMG_TRUE; 3729 bMMapSemHeld = IMG_TRUE;
3730 3730
3731 /* Get page list */ 3731 /* Get page list */
3732 psInfo->iNumPagesMapped = get_user_pages(current, current->mm, uStartAddr, psInfo->iNumPages, 1, 0, psInfo->ppsPages, NULL); 3732 psInfo->iNumPagesMapped = get_user_pages_remote(current, current->mm, uStartAddr, psInfo->iNumPages, FOLL_WRITE, psInfo->ppsPages, NULL);
3733 3733
3734 if (psInfo->iNumPagesMapped >= 0) 3734 if (psInfo->iNumPagesMapped >= 0)
3735 { 3735 {
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_drm.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
index 8b862a9..5ba106c 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
@@ -592,18 +592,6 @@ static struct drm_driver sPVRDrmDriver =
592 }, 592 },
593#endif 593#endif
594#endif 594#endif
595
596#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
597#if defined(LDM_PLATFORM)
598 .set_busid = drm_platform_set_busid,
599#else
600#if defined(LDM_PCI)
601 .set_busid = drm_pci_set_busid,
602#else
603 #error "LDM_PLATFORM or LDM_PCI must be set"
604#endif
605#endif
606#endif
607 .name = "pvr", 595 .name = "pvr",
608 .desc = PVR_DRM_DESC, 596 .desc = PVR_DRM_DESC,
609 .date = PVR_DRM_DATE, 597 .date = PVR_DRM_DATE,
diff --git a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk
index e1e8868..7a827ce 100644
--- a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk
+++ b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk
@@ -43,9 +43,9 @@ ccflags-y += \
43 -I$(TOP)/tools/intern/debug/client 43 -I$(TOP)/tools/intern/debug/client
44 44
45dbgdrv-y += \ 45dbgdrv-y += \
46 tools/intern/debug/dbgdriv/common/dbgdriv_handle.o \
46 tools/intern/debug/dbgdriv/common/dbgdriv.o \ 47 tools/intern/debug/dbgdriv/common/dbgdriv.o \
47 tools/intern/debug/dbgdriv/common/ioctl.o \ 48 tools/intern/debug/dbgdriv/common/ioctl.o \
48 tools/intern/debug/dbgdriv/common/handle.o \
49 tools/intern/debug/dbgdriv/common/hotkey.o \ 49 tools/intern/debug/dbgdriv/common/hotkey.o \
50 tools/intern/debug/dbgdriv/linux/main.o \ 50 tools/intern/debug/dbgdriv/linux/main.o \
51 tools/intern/debug/dbgdriv/linux/hostfunc.o 51 tools/intern/debug/dbgdriv/linux/hostfunc.o
diff --git a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/handle.c b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/dbgdriv_handle.c
index a9d37a6..a9d37a6 100644
--- a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/handle.c
+++ b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/dbgdriv_handle.c
diff --git a/jacinto6/touch-full_jacinto6evm.mk b/jacinto6/touch-full_jacinto6evm.mk
new file mode 100644
index 0000000..c1d27c0
--- /dev/null
+++ b/jacinto6/touch-full_jacinto6evm.mk
@@ -0,0 +1,24 @@
1# Copyright (C) 2012 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
16# Add Touchscreen- Define the tgz to be unpacked, and enable the
17# DRA71x-RevA-GT9271_SpecDig_Config.bin package, which is defined in the top-level Android.mk
18# of the proprietary-open tree
19
20ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),full_jacinto6evm))
21TOUCH_TGZ := device/ti/proprietary-open/jacinto6/touch_full_jacinto6evm.tgz
22TOUCH_BINARY := DRA71x-RevA-GT9271_SpecDig_Config.bin
23PRODUCT_PACKAGES += DRA71x-RevA-GT9271_SpecDig_Config.bin
24endif
diff --git a/jacinto6/touch_full_jacinto6evm.tgz b/jacinto6/touch_full_jacinto6evm.tgz
new file mode 100644
index 0000000..5cba4f0
--- /dev/null
+++ b/jacinto6/touch_full_jacinto6evm.tgz
Binary files differ