summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/sysreset/sysreset_sandbox.c8
-rw-r--r--test/dm/sysreset.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
index 7f6d4186e1..38e2a7e241 100644
--- a/drivers/sysreset/sysreset_sandbox.c
+++ b/drivers/sysreset/sysreset_sandbox.c
@@ -84,7 +84,13 @@ int sandbox_sysreset_get_status(struct udevice *dev, char *buf, int size)
int sandbox_sysreset_get_last(struct udevice *dev)
{
- return SYSRESET_COLD;
+ struct sandbox_state *state = state_get_current();
+
+ /*
+ * The first phase is a power reset, after that we assume we don't
+ * know.
+ */
+ return state->jumped_fname ? SYSRESET_WARM : SYSRESET_POWER;
}
static struct sysreset_ops sandbox_sysreset_ops = {
diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c
index e1b7bf5277..5b2358ef67 100644
--- a/test/dm/sysreset.c
+++ b/test/dm/sysreset.c
@@ -102,10 +102,10 @@ static int dm_test_sysreset_get_last(struct unit_test_state *uts)
/* Device 2 is the cold sysreset device */
ut_assertok(uclass_get_device(UCLASS_SYSRESET, 2, &dev));
- ut_asserteq(SYSRESET_COLD, sysreset_get_last(dev));
+ ut_asserteq(SYSRESET_POWER, sysreset_get_last(dev));
/* This is device 0, the non-DT one */
- ut_asserteq(SYSRESET_COLD, sysreset_get_last_walk());
+ ut_asserteq(SYSRESET_POWER, sysreset_get_last_walk());
return 0;
}