diff options
author | Praneeth Bajjuri | 2016-08-15 15:15:54 -0500 |
---|---|---|
committer | Praneeth Bajjuri | 2016-08-15 15:15:54 -0500 |
commit | 16eb6b587d5cb94d7182243b60ee1098fc068dc7 (patch) | |
tree | 3a9872105136d61cdae52d7d2958309bc7468195 /jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile | |
parent | b730c542c6203e7ad6236d92d5b3005b317b8caa (diff) | |
parent | 161d76728da3a1757438d77e7962e9cd8475c2ec (diff) | |
download | device-ti-proprietary-open-d-marshmallow-release.tar.gz device-ti-proprietary-open-d-marshmallow-release.tar.xz device-ti-proprietary-open-d-marshmallow-release.zip |
Merge branch 'd-marshmallow-mr2-release' of git://git.omapzoom.org/device/ti/proprietary-open into d-marshmallow-released-marshmallow-release
* 'd-marshmallow-mr2-release' of git://git.omapzoom.org/device/ti/proprietary-open:
am57x: proprietary-open: Makefile update target to pick am57xevm
jacinto6: sgx: Extend SGX support for platforms other than DRA7
jacinto6: update SGX kernel module for latest kernel
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile')
-rw-r--r-- | jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
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 22d3d49..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 | |||
@@ -98,6 +98,11 @@ SUPPORT_ACTIVE_POWER_MANAGEMENT := 0 | |||
98 | 98 | ||
99 | endif | 99 | endif |
100 | 100 | ||
101 | ifneq ($(filter am57xevm,$(TARGET_DEVICE)),) | ||
102 | HAL_VARIANT := am57x | ||
103 | |||
104 | endif | ||
105 | |||
101 | # Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs | 106 | # Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs |
102 | # require new Android TARGET_DEVICE builds. | 107 | # require new Android TARGET_DEVICE builds. |
103 | # | 108 | # |