diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2016-08-15 15:15:54 -0500 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2016-08-15 15:15:54 -0500 |
| commit | 16eb6b587d5cb94d7182243b60ee1098fc068dc7 (patch) | |
| tree | 3a9872105136d61cdae52d7d2958309bc7468195 | |
| parent | b730c542c6203e7ad6236d92d5b3005b317b8caa (diff) | |
| parent | 161d76728da3a1757438d77e7962e9cd8475c2ec (diff) | |
| download | proprietary-open-jacinto-d-marshmallow-release.tar.gz | |
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.tgz | bin | 3120534 -> 1673171 bytes | |||
| -rw-r--r-- | jacinto6/sgx/Android.mk | 9 | ||||
| -rw-r--r-- | jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz Binary files differindex 1f5b35d..af44c2f 100644 --- a/jacinto6/sgx.tgz +++ b/jacinto6/sgx.tgz 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) 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)" + $(eval FIXED_SRC := $$(img-sgx.untarred_bin)/$(subst $(TARGET_BOARD_PLATFORM),jacinto6,$1)) + @echo "Copy $$@ <- $(FIXED_SRC)" @mkdir -p $(dir $$@) - $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@ + $$(hide) $$(ACP) -fp $(FIXED_SRC) $$@ endef define _add-sgx-vendor-bin @@ -99,8 +100,8 @@ prebuilt_sgx_vendor_libs := \ lib/libusc.so \ lib/libPVRScopeServices.so \ lib/libsrv_um.so \ - lib/hw/gralloc.jacinto6.so \ - lib/hw/memtrack.jacinto6.so \ + lib/hw/gralloc.$(TARGET_BOARD_PLATFORM).so \ + lib/hw/memtrack.$(TARGET_BOARD_PLATFORM).so \ lib/libpvrANDROID_WSEGL.so \ lib/libpvr2d.so \ 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 endif +ifneq ($(filter am57xevm,$(TARGET_DEVICE)),) +HAL_VARIANT := am57x + +endif + # Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs # require new Android TARGET_DEVICE builds. # |