From 555a4470c7e6373cb6d5397ea5e9278317bcb008 Mon Sep 17 00:00:00 2001 From: You-Cheng Syu Date: Tue, 9 Apr 2019 13:04:34 +0800 Subject: include: Move RESET_FLAG_* into ec_commands.h as EC_RESET_FLAG_* RESET_FLAGS_* are used when setting/reading the field ec_reset_flags of struct ec_response_uptime_info, which is defined in ec_commands.h. So it might be better to put those macros there. To be consistent with the other macros in the file, add "EC_" prefixes to them. BUG=b:109900671,b:118654976 BRANCH=none TEST=make buildall -j Cq-Depend: chrome-internal:1054910, chrome-internal:1054911, chrome-internal:1045539 Change-Id: If72ec25f1b34d8d46b74479fb4cd09252102aafa Signed-off-by: You-Cheng Syu Reviewed-on: https://chromium-review.googlesource.com/1520574 Tested-by: Yu-Ping Wu Commit-Ready: Yu-Ping Wu Legacy-Commit-Queue: Commit Bot Reviewed-by: Yilun Lin Reviewed-by: Daisuke Nojiri --- board/cr50/board.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'board/cr50/board.c') diff --git a/board/cr50/board.c b/board/cr50/board.c index eb7e2cb3d6..9ec4edcbd6 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -712,7 +712,7 @@ static void board_init(void) * Deep sleep resets should be considered valid and should not impact * the rolling reboot count. */ - if (system_get_reset_flags() & RESET_FLAG_HIBERNATE) + if (system_get_reset_flags() & EC_RESET_FLAG_HIBERNATE) system_decrement_retry_counter(); configure_board_specific_gpios(); init_pmu(); @@ -728,7 +728,7 @@ static void board_init(void) * If this was a low power wake and not a rollback, restore the ccd * state from the long-life register. */ - if ((system_get_reset_flags() & RESET_FLAG_HIBERNATE) && + if ((system_get_reset_flags() & EC_RESET_FLAG_HIBERNATE) && !system_rollback_detected()) { ccd_init_state = (GREG32(PMU, LONG_LIFE_SCRATCH1) & BOARD_CCD_STATE) >> BOARD_CCD_SHIFT; @@ -1412,7 +1412,7 @@ static void init_board_properties(void) * update from a version not setting the register. */ if (!(properties & BOARD_ALL_PROPERTIES) || (system_get_reset_flags() & - RESET_FLAG_HARD)) { + EC_RESET_FLAG_HARD)) { /* * Mask board properties because following hard reset, they * won't be cleared. -- cgit v1.2.1