From 03390f88bf4a5738302f6757ff47c11c45f28954 Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Fri, 5 Aug 2016 16:59:54 -0500 Subject: jacinto6: update SGX kernel module for latest kernel Update SGX kernel module for latest kernel. Kernel commit: b6c1f1bacaedc698f7368d21f8775154fd3d2b01 Kernel Version: 4.4.16 Kernel branch: p-ti-lsk-android-linux-4.4.y Change-Id: I44288234e55fff9c29367731e1bb3efbff6ea62f Signed-off-by: Praneeth Bajjuri --- jacinto6/sgx.tgz | Bin 3120534 -> 1673171 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz index 1f5b35d..af44c2f 100644 Binary files a/jacinto6/sgx.tgz and b/jacinto6/sgx.tgz differ -- cgit v1.2.3 From 95953b5a78aef37d2c5ff6d33d24042090bb1004 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Fri, 5 Aug 2016 21:10:32 +0300 Subject: jacinto6: sgx: Extend SGX support for platforms other than DRA7 We need next pre-built libraries gralloc.jacinto6.so memtrack.jacinto6.so to have names w.r.t. platform we are building AFS for. For instance, for AM57x EVM we want those libraries to be named like this: gralloc.am57x.so memtrack.am57x.so Android UI won't bring up without this change. Change-Id: Ic6ff167ad311fef558e1c8b4e83a55dfe9f4c634 Signed-off-by: Sam Protsenko --- jacinto6/sgx/Android.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 \ -- cgit v1.2.3 From a374de1071cac5e606c103708f1069776806bc34 Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Sun, 31 Jul 2016 23:23:38 -0500 Subject: am57x: proprietary-open: Makefile update target to pick am57xevm update proprietary-open target makefiles to pick am57xevm Change-Id: I2f84b39c5cb6037999b7e85ed1792bc431666ee4 Signed-off-by: Praneeth Bajjuri --- Android.mk | 3 +-- jacinto6/Android.mk | 2 +- jacinto6/ducati-full_jacinto6evm.mk | 2 +- .../eurasia_km/eurasiacon/build/linux2/omap_android/Makefile | 11 ++++++++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Android.mk b/Android.mk index 5934899..12fc0f3 100644 --- a/Android.mk +++ b/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(my-dir) img-sgx.untarred_intermediates := $(call intermediates-dir-for, FAKE, img-sgx.untarred) img-sgx.untarred_timestamp := $(img-sgx.untarred_intermediates)/stamp img-sgx.untarred_bin := $(img-sgx.untarred_intermediates)/sgx -img-sgx.tar := $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)/sgx.tgz +img-sgx.tar := $(LOCAL_PATH)/jacinto6/sgx.tgz include $(call all-subdir-makefiles) @@ -69,5 +69,4 @@ $(LOCAL_BUILT_MODULE) : $(ti-tesla.untarred_timestamp) | $(ACP) @mkdir -p $(dir $@) $(hide) $(ACP) -fp $(PRIVATE_SRC) $@ endif - ############################################# diff --git a/jacinto6/Android.mk b/jacinto6/Android.mk index f99f4b2..6732813 100644 --- a/jacinto6/Android.mk +++ b/jacinto6/Android.mk @@ -13,6 +13,6 @@ # limitations under the License. # -ifeq ($(TARGET_BOARD_PLATFORM),jacinto6) +ifeq ($(TARGET_BOARD_PLATFORM),$(filter $(TARGET_BOARD_PLATFORM),jacinto6 am57x)) include $(call all-subdir-makefiles) endif diff --git a/jacinto6/ducati-full_jacinto6evm.mk b/jacinto6/ducati-full_jacinto6evm.mk index aeabda4..1ca52f7 100644 --- a/jacinto6/ducati-full_jacinto6evm.mk +++ b/jacinto6/ducati-full_jacinto6evm.mk @@ -17,7 +17,7 @@ # ducati-m3.bin package, which is defined in the top-level Android.mk # of the proprietary-open tree -ifeq (full_jacinto6evm,$(TARGET_PRODUCT)) +ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),full_jacinto6evm full_am57xevm)) DUCATI_TGZ := device/ti/proprietary-open/jacinto6/ducati_full_jacinto6evm.tgz DUCATI_BINARY := dra7-ipu2-fw.xem4 PRODUCT_PACKAGES += dra7-ipu2-fw.xem4 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 03efcdb..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 @@ -51,6 +51,10 @@ ifeq ($(TARGET_DEVICE),) override TARGET_DEVICE := jacinto6evm endif +ifeq ($(TARGET_DEVICE),) +override TARGET_DEVICE := am57xevm +endif + # Customize this build as per the TARGET_DEVICE setting # ifneq ($(filter blaze blaze_tablet panda tuna maguro toro mysid yakju,$(TARGET_DEVICE)),) @@ -77,7 +81,7 @@ VS_PRODUCT_VERSION := 5 # FIXME: Re-enable this ASAP SUPPORT_ACTIVE_POWER_MANAGEMENT := 0 endif -ifneq ($(filter jacinto6evm,$(TARGET_DEVICE)),) +ifneq ($(filter jacinto6evm am57xevm,$(TARGET_DEVICE)),) SGXCORE := 544 SGX_CORE_REV := 116 SGX_FEATURE_MP := 1 @@ -94,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. # -- cgit v1.2.3