summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2016-07-31 23:23:38 -0500
committerPraneeth Bajjuri2016-08-01 01:33:14 -0500
commitb730c542c6203e7ad6236d92d5b3005b317b8caa (patch)
treeac74edeeb0ee91f76b08c07980536f0b553b4799
parent6e03d0aa02c3a14481493dd9f22f66b2fcf14199 (diff)
downloaddevice-ti-proprietary-open-b730c542c6203e7ad6236d92d5b3005b317b8caa.tar.gz
device-ti-proprietary-open-b730c542c6203e7ad6236d92d5b3005b317b8caa.tar.xz
device-ti-proprietary-open-b730c542c6203e7ad6236d92d5b3005b317b8caa.zip
am57x: update target to pick am57xevm
update target makefiles to pick am57xevm Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-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/Makefile6
4 files changed, 8 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..22d3d49 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