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 /drivers/sysreset | |
| parent | 896cc5aa4a8fc0c28036b9615a37f0034addad44 (diff) | |
| parent | dc4b2a9770b5b932cd6d98c33ebff6dc46de6849 (diff) | |
| download | u-boot-22ad69b7987eb4b10221330661db4427e40174fb.tar.gz | |
Merge tag 'dm-pull5nov20' of git://git.denx.de/u-boot-dmWIP/06Nov2020
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 'drivers/sysreset')
| -rw-r--r-- | drivers/sysreset/sysreset_sandbox.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c index 71cabd1956..7026a48c4b 100644 --- a/drivers/sysreset/sysreset_sandbox.c +++ b/drivers/sysreset/sysreset_sandbox.c @@ -56,6 +56,9 @@ static int sandbox_sysreset_request(struct udevice *dev, enum sysreset_t type) switch (type) { case SYSRESET_COLD: state->last_sysreset = type; + if (!state->sysreset_allowed[type]) + return -EACCES; + sandbox_reset(); break; case SYSRESET_POWER_OFF: state->last_sysreset = type; |