diff options
-rw-r--r-- | Android.mk | 3 | ||||
-rw-r--r-- | jacinto6/Android.mk | 2 | ||||
-rw-r--r-- | jacinto6/ducati-full_jacinto6evm.mk | 2 | ||||
-rw-r--r-- | jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile | 11 |
4 files changed, 13 insertions, 5 deletions
@@ -2,7 +2,7 @@ LOCAL_PATH := $(my-dir) | |||
2 | img-sgx.untarred_intermediates := $(call intermediates-dir-for, FAKE, img-sgx.untarred) | 2 | img-sgx.untarred_intermediates := $(call intermediates-dir-for, FAKE, img-sgx.untarred) |
3 | img-sgx.untarred_timestamp := $(img-sgx.untarred_intermediates)/stamp | 3 | img-sgx.untarred_timestamp := $(img-sgx.untarred_intermediates)/stamp |
4 | img-sgx.untarred_bin := $(img-sgx.untarred_intermediates)/sgx | 4 | img-sgx.untarred_bin := $(img-sgx.untarred_intermediates)/sgx |
5 | img-sgx.tar := $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)/sgx.tgz | 5 | img-sgx.tar := $(LOCAL_PATH)/jacinto6/sgx.tgz |
6 | 6 | ||
7 | include $(call all-subdir-makefiles) | 7 | include $(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) $@ |
71 | endif | 71 | endif |
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 | ||
16 | ifeq ($(TARGET_BOARD_PLATFORM),jacinto6) | 16 | ifeq ($(TARGET_BOARD_PLATFORM),$(filter $(TARGET_BOARD_PLATFORM),jacinto6 am57x)) |
17 | include $(call all-subdir-makefiles) | 17 | include $(call all-subdir-makefiles) |
18 | endif | 18 | 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 @@ | |||
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 | ||
20 | ifeq (full_jacinto6evm,$(TARGET_PRODUCT)) | 20 | ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),full_jacinto6evm full_am57xevm)) |
21 | DUCATI_TGZ := device/ti/proprietary-open/jacinto6/ducati_full_jacinto6evm.tgz | 21 | DUCATI_TGZ := device/ti/proprietary-open/jacinto6/ducati_full_jacinto6evm.tgz |
22 | DUCATI_BINARY := dra7-ipu2-fw.xem4 | 22 | DUCATI_BINARY := dra7-ipu2-fw.xem4 |
23 | PRODUCT_PACKAGES += dra7-ipu2-fw.xem4 | 23 | 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),) | |||
51 | override TARGET_DEVICE := jacinto6evm | 51 | override TARGET_DEVICE := jacinto6evm |
52 | endif | 52 | endif |
53 | 53 | ||
54 | ifeq ($(TARGET_DEVICE),) | ||
55 | override TARGET_DEVICE := am57xevm | ||
56 | endif | ||
57 | |||
54 | # Customize this build as per the TARGET_DEVICE setting | 58 | # Customize this build as per the TARGET_DEVICE setting |
55 | # | 59 | # |
56 | ifneq ($(filter blaze blaze_tablet panda tuna maguro toro mysid yakju,$(TARGET_DEVICE)),) | 60 | ifneq ($(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 |
78 | SUPPORT_ACTIVE_POWER_MANAGEMENT := 0 | 82 | SUPPORT_ACTIVE_POWER_MANAGEMENT := 0 |
79 | endif | 83 | endif |
80 | ifneq ($(filter jacinto6evm,$(TARGET_DEVICE)),) | 84 | ifneq ($(filter jacinto6evm am57xevm,$(TARGET_DEVICE)),) |
81 | SGXCORE := 544 | 85 | SGXCORE := 544 |
82 | SGX_CORE_REV := 116 | 86 | SGX_CORE_REV := 116 |
83 | SGX_FEATURE_MP := 1 | 87 | SGX_FEATURE_MP := 1 |
@@ -94,6 +98,11 @@ SUPPORT_ACTIVE_POWER_MANAGEMENT := 0 | |||
94 | 98 | ||
95 | endif | 99 | endif |
96 | 100 | ||
101 | ifneq ($(filter am57xevm,$(TARGET_DEVICE)),) | ||
102 | HAL_VARIANT := am57x | ||
103 | |||
104 | endif | ||
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 | # |