diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-06 11:27:14 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-06 11:27:14 -0500 |
| commit | 22ad69b7987eb4b10221330661db4427e40174fb (patch) | |
| tree | b13bc4ba708907cd76a0ec09c4599b55cb586953 /arch/sandbox/cpu/state.c | |
| parent | 896cc5aa4a8fc0c28036b9615a37f0034addad44 (diff) | |
| parent | dc4b2a9770b5b932cd6d98c33ebff6dc46de6849 (diff) | |
Merge tag 'dm-pull5nov20' of git://git.denx.de/u-boot-dm
patman status subcommand to collect tags from Patchwork
patman showing email replies from Patchwork
sandbox poweroff command
minor fixes in binman, tests
Diffstat (limited to 'arch/sandbox/cpu/state.c')
| -rw-r--r-- | arch/sandbox/cpu/state.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index 34b6fff7e7a..59f37fab0b8 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -358,6 +358,7 @@ void state_reset_for_test(struct sandbox_state *state) /* No reset yet, so mark it as such. Always allow power reset */ state->last_sysreset = SYSRESET_COUNT; state->sysreset_allowed[SYSRESET_POWER_OFF] = true; + state->sysreset_allowed[SYSRESET_COLD] = true; state->allow_memio = false; memset(&state->wdt, '\0', sizeof(state->wdt)); |