diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 14:25:28 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:48:25 +0000 |
| commit | 0f816491a2a1f65757a1369419400c9683ffc57e (patch) | |
| tree | 64e46ef33d1d8c8c7946d824acda7d0e46f3d957 /common/system.c | |
| parent | 7d137985d47daa4ab91da3242ad66c016b88b39c (diff) | |
| download | chrome-ec-0f816491a2a1f65757a1369419400c9683ffc57e.tar.gz | |
Revert "util/ectool, common/system: Share sysmbol reset_flag_desc."
This reverts commit 2b452718a0b2e08fad8e0a830b443db862bf806c.
BUG=b:200823466
TEST=make buildall -j
Change-Id: I968c8f0a2845f5a9baf2e2aa55e8efea6f637c4b
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273388
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'common/system.c')
| -rw-r--r-- | common/system.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/common/system.c b/common/system.c index a945f3b727..9dc37b668a 100644 --- a/common/system.c +++ b/common/system.c @@ -84,6 +84,16 @@ struct jump_data { /* Jump data (at end of RAM, or preceding panic data) */ static struct jump_data *jdata; +/* + * Reset flag descriptions. Must be in same order as bits of RESET_FLAG_ + * constants. + */ +static const char * const reset_flag_descs[] = { + "other", "reset-pin", "brownout", "power-on", "watchdog", "soft", + "hibernate", "rtc-alarm", "wake-pin", "low-battery", "sysjump", + "hard", "ap-off", "preserved", "usb-resume", "rdd", "rbox", + "security", "ap-watchdog" }; + static uint32_t reset_flags; static int jumped_to_image; static int disable_jump; /* Disable ALL jumps if system is locked */ @@ -267,9 +277,6 @@ void system_print_reset_flags(void) { int count = 0; int i; - static const char * const reset_flag_descs[] = { - #include "reset_flag_desc.inc" - }; if (!reset_flags) { CPUTS("unknown"); @@ -284,13 +291,6 @@ void system_print_reset_flags(void) CPUTS(reset_flag_descs[i]); } } - - if (reset_flags >= BIT(i)) { - if (count) - CPUTS(" "); - - CPUTS("no-desc"); - } } int system_jumped_to_this_image(void) |