summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2016-11-09 10:51:56 -0600
committerPraneeth Bajjuri2016-11-09 10:51:56 -0600
commit44988864855c80d63dabf8395fb8e3f95df9be0f (patch)
tree5fdae0913fd6d0f101c2e2b086c68337b406068b
parent39d5ab159a9f4de8339eae621d6fc0690ee9ba60 (diff)
parentc861bf4443f039a78b96e18463e621b7c3c24f73 (diff)
downloaddevice-ti-proprietary-open-44988864855c80d63dabf8395fb8e3f95df9be0f.tar.gz
device-ti-proprietary-open-44988864855c80d63dabf8395fb8e3f95df9be0f.tar.xz
device-ti-proprietary-open-44988864855c80d63dabf8395fb8e3f95df9be0f.zip
Merge branch 'd-marshmallow-mr2-release' of git://git.omapzoom.org/device/ti/proprietary-open into d-nougat-release
* 'd-marshmallow-mr2-release' of git://git.omapzoom.org/device/ti/proprietary-open: jacinto6: update SGX kernel module for latest kernel jacinto6: update ipu2 binary jacinto6: update SGX kernel module for latest kernel jacinto6: sgx-bin:sgx binaries update jacinto6: update SGX kernel module for latest kernel Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> Conflicts: jacinto6/sgx.tgz
-rw-r--r--jacinto6/README.SGX2
-rw-r--r--jacinto6/ducati_full_jacinto6evm.tgzbin1532530 -> 1532632 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX
index e0dc070..ce68344 100644
--- a/jacinto6/README.SGX
+++ b/jacinto6/README.SGX
@@ -16,7 +16,7 @@ sgx.tgz a set of binaries built for SGX544.
16[DDK Version] 16[DDK Version]
17 1.14/4001660 17 1.14/4001660
18[DDK commit ID] 18[DDK commit ID]
19 036d7d2 (HACK) SGX-UM: Copy pvrsrvctl as pvrsrvinit 19 3ed372b um: gralloc: change stride alignment to 16 pixels
20[Branch] 20[Branch]
21 android/1.14/4001660_k4.4_M 21 android/1.14/4001660_k4.4_M
22[Kernel modules built against] 22[Kernel modules built against]
diff --git a/jacinto6/ducati_full_jacinto6evm.tgz b/jacinto6/ducati_full_jacinto6evm.tgz
index 3c0d06b..71b540f 100644
--- a/jacinto6/ducati_full_jacinto6evm.tgz
+++ b/jacinto6/ducati_full_jacinto6evm.tgz
Binary files differ