diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-19 09:22:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-19 09:22:57 -0400 |
| commit | a2ca54ff52146f2bbf52d87bf4e121e8e15e9e07 (patch) | |
| tree | 4e85487bc3da5aa7a918ca7bb2f8fffb2c8c0d20 /arch/sandbox | |
| parent | 0ed2e2d825ac70d99ef89e3bb745979a22e2972e (diff) | |
| parent | b8050511c6ee4ab60ef4248dff42aff187696249 (diff) | |
Merge tag 'u-boot-rockchip-20190819' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Add ROC-RK3399-PC board support
- Move CONFIG_SPI_FLASH_GIGADEVICE and CONFIG_CMD_USB_MASS_STORAGE to
Kconfig
- using SYSRESET_POWER_OFF for poweroff
(Note that patch for rk8xx pmic is droped for it can not pass Travis
build)
- fix ofnode_get_name() assert
Diffstat (limited to 'arch/sandbox')
| -rw-r--r-- | arch/sandbox/cpu/state.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index 2333240fda..dee5fde4f7 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -355,7 +355,6 @@ 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)); |