summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Lo <josephl@nvidia.com>2015-04-15 14:30:55 +0800
committerPatrick Georgi <pgeorgi@google.com>2015-04-27 07:44:09 +0200
commit53a2f6078ac28738b6b52148eb8d90b2fc4132b5 (patch)
treebf48d4f897a79bdbb7ead6a2d2ad449b39c08cfb
parent36d3586e787addff57bb835c3aa1664b6c8ece94 (diff)
downloadcoreboot-53a2f6078ac28738b6b52148eb8d90b2fc4132b5.tar.xz
arm64: perform early setup in secmon too
Same as commit fe0eac5f416e "arm64: Allow cpu specific early setup", we need the same in secmon too. BRANCH=none BUG=none TEST=boot on smaug/foster Change-Id: I5b1347880306a95f99233db12cb99547bad4aa8c Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 1f70fd940ff92eb5b8991cd777c2894b7a9633cf Original-Change-Id: Ifce5a6d636051e7a447d055c8e09ed4e29e091c7 Original-Signed-off-by: Joseph Lo <josephl@nvidia.com> Original-Reviewed-on: https://chromium-review.googlesource.com/265825 Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org> Original-Reviewed-by: Benson Leung <bleung@chromium.org> Reviewed-on: http://review.coreboot.org/9978 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com>
-rw-r--r--src/arch/arm64/cpu/Makefile.inc1
-rw-r--r--src/arch/arm64/stage_entry.S1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/arch/arm64/cpu/Makefile.inc b/src/arch/arm64/cpu/Makefile.inc
index b4f39a5aa4..47aa0d0451 100644
--- a/src/arch/arm64/cpu/Makefile.inc
+++ b/src/arch/arm64/cpu/Makefile.inc
@@ -21,4 +21,5 @@
ifeq ($(CONFIG_ARCH_RAMSTAGE_ARM64),y)
ramstage-$(CONFIG_ARCH_ARM64_CPU_CORTEX_A57) += cortex_a57.S
+secmon-$(CONFIG_ARCH_ARM64_CPU_CORTEX_A57) += cortex_a57.S
endif
diff --git a/src/arch/arm64/stage_entry.S b/src/arch/arm64/stage_entry.S
index 66e40fbad3..cfe8edd1fa 100644
--- a/src/arch/arm64/stage_entry.S
+++ b/src/arch/arm64/stage_entry.S
@@ -216,6 +216,7 @@ ENDPROC(arm64_cpu_startup)
CPU_RESET_ENTRY(arm64_cpu_startup_resume)
split_bsp_path
+ bl arm64_cpu_early_setup
setup_sctlr
startup_restore
b arm64_c_environment