summaryrefslogtreecommitdiff
path: root/common/main.c
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2017-08-23 13:18:44 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-08-24 11:29:02 -0700
commit1029239bc18c1a8e1bff5f7aad040cdfe421dbd2 (patch)
tree95a1275901cc5e95f7d70e6a0646c87695b3e716 /common/main.c
parentc859c057e16c13d637326e7fae333e1d1eb80d7a (diff)
downloadchrome-ec-1029239bc18c1a8e1bff5f7aad040cdfe421dbd2.tar.gz
g: Move chip pre-init to chip_pre_init()
Currently, chip/g uses jtag_pre_init() to do some chip pre-initialization that isn't actually related to JTAG. This has been harmless, but it's currently the only chip which actually does "JTAG" pre-init, and we'd like to get rid of that. So, move that functionality to a new optional chip_pre_init() function. BUG=chromium:747629 BRANCH=cr50 TEST=make buildall boot cr50 make all dis; confirm chip_pre_init() is called early in <main> Change-Id: I3cae0747ab0c3cc974fce9f108947207b38e035f Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/629876 Reviewed-by: Mary Ruthven <mruthven@chromium.org> Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'common/main.c')
-rw-r--r--common/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/main.c b/common/main.c
index d1ea65d0d1..b2eb2eebe4 100644
--- a/common/main.c
+++ b/common/main.c
@@ -56,6 +56,10 @@ test_mockable __keep int main(void)
board_config_pre_init();
#endif
+#ifdef CONFIG_CHIP_PRE_INIT
+ chip_pre_init();
+#endif
+
#ifdef CONFIG_MPU
mpu_pre_init();
#endif