summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Mahaveer2016-08-08 17:20:48 -0500
committerGerrit Code Review2016-08-08 17:20:48 -0500
commit161d76728da3a1757438d77e7962e9cd8475c2ec (patch)
tree3a9872105136d61cdae52d7d2958309bc7468195
parent95953b5a78aef37d2c5ff6d33d24042090bb1004 (diff)
parenta374de1071cac5e606c103708f1069776806bc34 (diff)
downloaddevice-ti-proprietary-open-161d76728da3a1757438d77e7962e9cd8475c2ec.tar.gz
device-ti-proprietary-open-161d76728da3a1757438d77e7962e9cd8475c2ec.tar.xz
device-ti-proprietary-open-161d76728da3a1757438d77e7962e9cd8475c2ec.zip
Merge "am57x: proprietary-open: Makefile update target to pick am57xevm" into d-marshmallow-mr2-release
-rw-r--r--Android.mk3
-rw-r--r--jacinto6/Android.mk2
-rw-r--r--jacinto6/ducati-full_jacinto6evm.mk2
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile11
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)
2img-sgx.untarred_intermediates := $(call intermediates-dir-for, FAKE, img-sgx.untarred) 2img-sgx.untarred_intermediates := $(call intermediates-dir-for, FAKE, img-sgx.untarred)
3img-sgx.untarred_timestamp := $(img-sgx.untarred_intermediates)/stamp 3img-sgx.untarred_timestamp := $(img-sgx.untarred_intermediates)/stamp
4img-sgx.untarred_bin := $(img-sgx.untarred_intermediates)/sgx 4img-sgx.untarred_bin := $(img-sgx.untarred_intermediates)/sgx
5img-sgx.tar := $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)/sgx.tgz 5img-sgx.tar := $(LOCAL_PATH)/jacinto6/sgx.tgz
6 6
7include $(call all-subdir-makefiles) 7include $(call all-subdir-makefiles)
8 8
@@ -69,5 +69,4 @@ $(LOCAL_BUILT_MODULE) : $(ti-tesla.untarred_timestamp) | $(ACP)
69 @mkdir -p $(dir $@) 69 @mkdir -p $(dir $@)
70 $(hide) $(ACP) -fp $(PRIVATE_SRC) $@ 70 $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
71endif 71endif
72
73############################################# 72#############################################
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 @@
13# limitations under the License. 13# limitations under the License.
14# 14#
15 15
16ifeq ($(TARGET_BOARD_PLATFORM),jacinto6) 16ifeq ($(TARGET_BOARD_PLATFORM),$(filter $(TARGET_BOARD_PLATFORM),jacinto6 am57x))
17 include $(call all-subdir-makefiles) 17 include $(call all-subdir-makefiles)
18endif 18endif
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 @@
17# ducati-m3.bin package, which is defined in the top-level Android.mk 17# ducati-m3.bin package, which is defined in the top-level Android.mk
18# of the proprietary-open tree 18# of the proprietary-open tree
19 19
20ifeq (full_jacinto6evm,$(TARGET_PRODUCT)) 20ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),full_jacinto6evm full_am57xevm))
21DUCATI_TGZ := device/ti/proprietary-open/jacinto6/ducati_full_jacinto6evm.tgz 21DUCATI_TGZ := device/ti/proprietary-open/jacinto6/ducati_full_jacinto6evm.tgz
22DUCATI_BINARY := dra7-ipu2-fw.xem4 22DUCATI_BINARY := dra7-ipu2-fw.xem4
23PRODUCT_PACKAGES += dra7-ipu2-fw.xem4 23PRODUCT_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),)
51override TARGET_DEVICE := jacinto6evm 51override TARGET_DEVICE := jacinto6evm
52endif 52endif
53 53
54ifeq ($(TARGET_DEVICE),)
55override TARGET_DEVICE := am57xevm
56endif
57
54# Customize this build as per the TARGET_DEVICE setting 58# Customize this build as per the TARGET_DEVICE setting
55# 59#
56ifneq ($(filter blaze blaze_tablet panda tuna maguro toro mysid yakju,$(TARGET_DEVICE)),) 60ifneq ($(filter blaze blaze_tablet panda tuna maguro toro mysid yakju,$(TARGET_DEVICE)),)
@@ -77,7 +81,7 @@ VS_PRODUCT_VERSION := 5
77# FIXME: Re-enable this ASAP 81# FIXME: Re-enable this ASAP
78SUPPORT_ACTIVE_POWER_MANAGEMENT := 0 82SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
79endif 83endif
80ifneq ($(filter jacinto6evm,$(TARGET_DEVICE)),) 84ifneq ($(filter jacinto6evm am57xevm,$(TARGET_DEVICE)),)
81SGXCORE := 544 85SGXCORE := 544
82SGX_CORE_REV := 116 86SGX_CORE_REV := 116
83SGX_FEATURE_MP := 1 87SGX_FEATURE_MP := 1
@@ -94,6 +98,11 @@ SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
94 98
95endif 99endif
96 100
101ifneq ($(filter am57xevm,$(TARGET_DEVICE)),)
102HAL_VARIANT := am57x
103
104endif
105
97# Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs 106# Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs
98# require new Android TARGET_DEVICE builds. 107# require new Android TARGET_DEVICE builds.
99# 108#