From 401dcf7a06c707f01aca0f0ad147fcc65a847a1d Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Tue, 17 Apr 2018 15:47:15 -0700 Subject: [PATCH] riscv-compliance: make sure reset assertion and deassertion actually worked. --- src/target/riscv/riscv-013.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index 9d7bb95d8..3af52f902 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -3318,11 +3318,10 @@ int riscv013_test_compliance(struct target *target) dmi_read(target, &abstractauto, DMI_ABSTRACTAUTO); /* Pulse reset. */ - target->reset_halt = true; riscv_set_current_hartid(target, 0); - assert_reset(target); - deassert_reset(target); + COMPLIANCE_TEST(ERROR_OK == assert_reset(target), "Must be able to assert NDMRESET"); + COMPLIANCE_TEST(ERROR_OK == deassert_reset(target), "Must be able to deassert NDMRESET"); /* Verify that most stuff is not affected by ndmreset. */ dmi_read(target, &testvar_read, DMI_COMMAND);