summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHemant Hariyani2014-01-22 15:29:15 -0600
committerGerrit Code Review2014-01-22 15:29:16 -0600
commitb59d0d93f264fe3d789644674f8d451a6e3a137a (patch)
tree38b8a6c943f1f20ef3c60592e143c31e7a88ed2a
parent69ed0123bd48f6b0b702a4e8e06e96f57edca906 (diff)
parent08824733e3cd43297350eee4e9febce2c9d07f2e (diff)
downloaddevice-ti-proprietary-open-b59d0d93f264fe3d789644674f8d451a6e3a137a.tar.gz
device-ti-proprietary-open-b59d0d93f264fe3d789644674f8d451a6e3a137a.tar.xz
device-ti-proprietary-open-b59d0d93f264fe3d789644674f8d451a6e3a137a.zip
Merge "SGX-BIN: SGX binaries and KM source with APM enabled" into d-jb-mr2.0-release
-rw-r--r--jacinto6/sgx.tgzbin2656190 -> 2638310 bytes
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap4430_android/Makefile2
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/system/omap4/sysconfig.h2
3 files changed, 2 insertions, 2 deletions
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index 593a8c4..7aaa048 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
Binary files differ
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap4430_android/Makefile b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap4430_android/Makefile
index 0d9ba11..45cdb6f 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap4430_android/Makefile
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap4430_android/Makefile
@@ -67,7 +67,7 @@ endif
67export SGXCORE 67export SGXCORE
68export SGX_CORE_REV 68export SGX_CORE_REV
69 69
70SUPPORT_ACTIVE_POWER_MANAGEMENT := 0 70SUPPORT_ACTIVE_POWER_MANAGEMENT := 1
71 71
72SGX_DYNAMIC_TIMING_INFO := 1 72SGX_DYNAMIC_TIMING_INFO := 1
73 73
diff --git a/jacinto6/sgx_src/eurasia_km/services4/system/omap4/sysconfig.h b/jacinto6/sgx_src/eurasia_km/services4/system/omap4/sysconfig.h
index 64f3187..b2eac60 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/system/omap4/sysconfig.h
+++ b/jacinto6/sgx_src/eurasia_km/services4/system/omap4/sysconfig.h
@@ -56,7 +56,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
56 56
57/* Allow the AP latency to be overridden in the build config */ 57/* Allow the AP latency to be overridden in the build config */
58#if !defined(SYS_SGX_ACTIVE_POWER_LATENCY_MS) 58#if !defined(SYS_SGX_ACTIVE_POWER_LATENCY_MS)
59#define SYS_SGX_ACTIVE_POWER_LATENCY_MS (2) 59#define SYS_SGX_ACTIVE_POWER_LATENCY_MS (100)
60#endif 60#endif
61 61
62 62