aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Zhao <jerryz123@berkeley.edu>2023-12-11 15:56:40 -0800
committerGitHub <noreply@github.com>2023-12-11 15:56:40 -0800
commitf9cd7ee5cf1a05318cdd9545b4dd0d9e4d541e66 (patch)
tree5c51192996f94e8f8bde0c604f42188521cbc175
parent72d23d647cb77c3c9dba4f60990f12d8aa895b60 (diff)
parent87690a90c785230eab306c2af973b3cbfe9bd88a (diff)
downloadriscv-isa-sim-f9cd7ee5cf1a05318cdd9545b4dd0d9e4d541e66.zip
riscv-isa-sim-f9cd7ee5cf1a05318cdd9545b4dd0d9e4d541e66.tar.gz
riscv-isa-sim-f9cd7ee5cf1a05318cdd9545b4dd0d9e4d541e66.tar.bz2
Merge pull request #1314 from endeneer/fdt-parse-plic-sifive
riscv: sim.cc: Parse for other compatible strings if "riscv,plic0" is absent
-rw-r--r--riscv/plic.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/riscv/plic.cc b/riscv/plic.cc
index 57c37c5..44f80cf 100644
--- a/riscv/plic.cc
+++ b/riscv/plic.cc
@@ -418,7 +418,8 @@ std::string plic_generate_dts(const sim_t* sim)
plic_t* plic_parse_from_fdt(const void* fdt, const sim_t* sim, reg_t* base, const std::vector<std::string>& sargs)
{
uint32_t plic_ndev;
- if (fdt_parse_plic(fdt, base, &plic_ndev, "riscv,plic0") == 0)
+ if (fdt_parse_plic(fdt, base, &plic_ndev, "riscv,plic0") == 0 ||
+ fdt_parse_plic(fdt, base, &plic_ndev, "sifive,plic-1.0.0") == 0)
return new plic_t(sim, plic_ndev);
else
return nullptr;