diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-11 18:10:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-11 18:10:11 -0400 |
| commit | a9758ece08bceb60634145c2126582e5d282bd09 (patch) | |
| tree | b391039a3bc2aa8222a14b3e960541296d585878 /arch/sandbox/cpu/state.c | |
| parent | 68deea2308141c26707da44654b273d7b072ab0d (diff) | |
| parent | 7ea33579576d2bcd19df76bd8769e7ab3b4a169b (diff) | |
Merge tag 'dm-pull-9jul19-take2' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
- Sandbox improvements including .dts refactor
- Minor tracing and PCI improvements
- Various other minor fixes
- Conversion of patman, dtoc and binman to support Python 3
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 d3b9c05985..2333240fda 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -356,6 +356,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] = true; + state->sysreset_allowed[SYSRESET_POWER_OFF] = true; memset(&state->wdt, '\0', sizeof(state->wdt)); memset(state->spi, '\0', sizeof(state->spi)); |