From 8128a56c0ec7e147d4ad68e6ba55979e9ead25ae Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 18 Sep 2013 05:48:37 -0700 Subject: trustzone: Pull trustzone init out of cpu.c and do it in romstage. Trustzone needs to be initialized/disabled both on boot and on wake, so it needs to be done before ramstage which doesn't run on wake. cpu.c isn't compiled into romstage and fixing that causes other problems, so the trustzone functions were split out. Change-Id: I8fc630237ebec1f02a91600f8baf3d4e9ea66d0e Signed-off-by: Gabe Black Reviewed-on: https://chromium-review.googlesource.com/169817 Reviewed-by: Gabe Black Tested-by: Gabe Black Commit-Queue: Gabe Black (cherry picked from commit 055ed0e28476123b0bd666109af90baf40aadcee) Signed-off-by: Isaac Christensen Reviewed-on: http://review.coreboot.org/6666 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Ronald G. Minnich --- src/mainboard/google/snow/romstage.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/mainboard/google/snow') diff --git a/src/mainboard/google/snow/romstage.c b/src/mainboard/google/snow/romstage.c index 44074c58bf..1c49d35e9f 100644 --- a/src/mainboard/google/snow/romstage.c +++ b/src/mainboard/google/snow/romstage.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -154,6 +155,9 @@ void main(void) setup_power(is_resume); setup_memory(mem, is_resume); + /* This needs to happen on normal boots and on resume. */ + trustzone_init(); + if (is_resume) { wakeup(); } -- cgit v1.2.3