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 <praneeth@ti.com>

diff --git a/Android.mk b/Android.mk
index 59348999ad08343ae52c411906e9cb16e7469cc7..12fc0f3a91fa41f86e28068286397e6d0c02b587 100644 (file)
--- 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 f99f4b2a3fe169f8dd287ed4c4bdaaf3f25f39e7..673281359b40a6c9155b6aaf81435f81f079a7d4 100644 (file)
--- 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 aeabda4aaee4678812681dbdbd987d1b43ab3fb0..1ca52f70059d4456cc53f44ea5ac055f86d44f69 100644 (file)
--- 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 03efcdbca793d57c3097b3e50dcddd01eab6f4b3..046b8bb64a7478f9569ad208a3a2308e7ce5f97f 100644 (file)
--- 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.
 #