summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorHyung Taek Ryoo <hryoo@nvidia.com>2012-08-10 11:48:56 -0700
committerSimone Willett <swillett@nvidia.com>2012-08-16 11:02:09 -0700
commit833e152507b2351ae71de1a2b224745f550f8f7e (patch)
treec109f08794ef6e1d7fa55c18b1a270e2ec54ea5d /security
parent361f7676aaecfd0157b89f0e106f59fcc229a839 (diff)
security: tf_driver: integrate latest TL release
Tegra 3 version: TF_TEGRA3_AB01.15.36932 1)Fix an issue in GIC controller 2)Add a task profiler option into the Trusted Foundations 3)Fixes the RCU stalls Change-Id: Ib137dc4f155765cb7d7084f1f9a6f75d3bf38116 Signed-off-by: Hyung Taek Ryoo <hryoo@nvidia.com> Reviewed-on: http://git-master/r/122808 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: James Zhao <jamesz@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'security')
-rw-r--r--security/tf_driver/s_version.h2
-rw-r--r--security/tf_driver/tf_protocol.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/security/tf_driver/s_version.h b/security/tf_driver/s_version.h
index 81d030a75835..2f52e75ac8a3 100644
--- a/security/tf_driver/s_version.h
+++ b/security/tf_driver/s_version.h
@@ -38,7 +38,7 @@
/*
* This version number must be updated for each new release
*/
-#define S_VERSION_MAIN "01.14"
+#define S_VERSION_MAIN "01.15"
/*
* If this is a patch or engineering version use the following
diff --git a/security/tf_driver/tf_protocol.h b/security/tf_driver/tf_protocol.h
index b264f04c4454..e39842bd6e16 100644
--- a/security/tf_driver/tf_protocol.h
+++ b/security/tf_driver/tf_protocol.h
@@ -659,7 +659,7 @@ struct tf_l1_shared_buffer {
#ifdef CONFIG_TF_ZEBRA
u8 rpc_trace_buffer[140];
u8 rpc_cus_buffer[180];
- #elif CONFIG_SECURE_TRACES
+ #elif defined(CONFIG_SECURE_TRACES)
u32 traces_status;
u8 traces_buffer[140];
u8 reserved3[176];