From d4c7f30feeab294406e2643183c6bd7e3095edfe Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Thu, 25 Jun 2020 11:51:03 -0700 Subject: Swap system_jumped_to_this_image with system_jumped_late EFS2 boards need to call system_jumped_late in HOOK_INIT to avoid running init code twice per boot. system_jumped_to_this_image and system_jumped_late are functionally equivalent for non EFS2 boards. This patch will prevent system_jumped_to_this_image from being used for EFS2 boards when code is copied from a past project. BUG=chromium:1072743 BRANCH=none TEST=buildall Signed-off-by: Daisuke Nojiri Change-Id: I73fb5cedc5325d1c80825f9346954013046ee1df Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2267685 Reviewed-by: Keith Short --- baseboard/octopus/baseboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'baseboard/octopus') diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c index e2c4eb30f4..bea8447ef3 100644 --- a/baseboard/octopus/baseboard.c +++ b/baseboard/octopus/baseboard.c @@ -231,7 +231,7 @@ enum adc_channel board_get_vbus_adc(int port) void baseboard_tcpc_init(void) { /* Only reset TCPC if not sysjump */ - if (!system_jumped_to_this_image()) + if (!system_jumped_late()) board_reset_pd_mcu(); /* -- cgit v1.2.1