summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2016-08-15 15:15:54 -0500
committerPraneeth Bajjuri2016-08-15 15:15:54 -0500
commit16eb6b587d5cb94d7182243b60ee1098fc068dc7 (patch)
tree3a9872105136d61cdae52d7d2958309bc7468195
parentb730c542c6203e7ad6236d92d5b3005b317b8caa (diff)
parent161d76728da3a1757438d77e7962e9cd8475c2ec (diff)
downloaddevice-ti-proprietary-open-d-marshmallow-release.tar.gz
device-ti-proprietary-open-d-marshmallow-release.tar.xz
device-ti-proprietary-open-d-marshmallow-release.zip
Merge branch 'd-marshmallow-mr2-release' of git://git.omapzoom.org/device/ti/proprietary-open into d-marshmallow-released-marshmallow-release
* 'd-marshmallow-mr2-release' of git://git.omapzoom.org/device/ti/proprietary-open: am57x: proprietary-open: Makefile update target to pick am57xevm jacinto6: sgx: Extend SGX support for platforms other than DRA7 jacinto6: update SGX kernel module for latest kernel Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--jacinto6/sgx.tgzbin3120534 -> 1673171 bytes
-rw-r--r--jacinto6/sgx/Android.mk9
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile5
3 files changed, 10 insertions, 4 deletions
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index 1f5b35d..af44c2f 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 862dffb..9d007ad 100644
--- a/jacinto6/sgx/Android.mk
+++ b/jacinto6/sgx/Android.mk
@@ -28,9 +28,10 @@ LOCAL_PATH := $$(img-sgx.untarred_bin)
28include $$(BUILD_SYSTEM)/base_rules.mk 28include $$(BUILD_SYSTEM)/base_rules.mk
29$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1 29$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
30$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP) 30$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
31 @echo "Copy $$@ <- $$(PRIVATE_SRC)" 31 $(eval FIXED_SRC := $$(img-sgx.untarred_bin)/$(subst $(TARGET_BOARD_PLATFORM),jacinto6,$1))
32 @echo "Copy $$@ <- $(FIXED_SRC)"
32 @mkdir -p $(dir $$@) 33 @mkdir -p $(dir $$@)
33 $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@ 34 $$(hide) $$(ACP) -fp $(FIXED_SRC) $$@
34endef 35endef
35 36
36define _add-sgx-vendor-bin 37define _add-sgx-vendor-bin
@@ -99,8 +100,8 @@ prebuilt_sgx_vendor_libs := \
99 lib/libusc.so \ 100 lib/libusc.so \
100 lib/libPVRScopeServices.so \ 101 lib/libPVRScopeServices.so \
101 lib/libsrv_um.so \ 102 lib/libsrv_um.so \
102 lib/hw/gralloc.jacinto6.so \ 103 lib/hw/gralloc.$(TARGET_BOARD_PLATFORM).so \
103 lib/hw/memtrack.jacinto6.so \ 104 lib/hw/memtrack.$(TARGET_BOARD_PLATFORM).so \
104 lib/libpvrANDROID_WSEGL.so \ 105 lib/libpvrANDROID_WSEGL.so \
105 lib/libpvr2d.so \ 106 lib/libpvr2d.so \
106 lib/libsrv_init.so \ 107 lib/libsrv_init.so \
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 22d3d49..046b8bb 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
@@ -98,6 +98,11 @@ SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
98 98
99endif 99endif
100 100
101ifneq ($(filter am57xevm,$(TARGET_DEVICE)),)
102HAL_VARIANT := am57x
103
104endif
105
101# Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs 106# Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs
102# require new Android TARGET_DEVICE builds. 107# require new Android TARGET_DEVICE builds.
103# 108#