Merge branch 'qemu-for-testing' into riscv-all

riscvarchive · Oct 2, 2018 · 950dc3f · 950dc3f
2 parents 7ba0b31 + 49a876d
commit 950dc3f
Show file tree

Hide file tree

Showing 17 changed files with 1,506 additions and 95 deletions.
diff --git a/Makefile.objs b/Makefile.objs
@@ -228,6 +228,7 @@ trace-events-subdirs += hw/nvram
 trace-events-subdirs += hw/pci
 trace-events-subdirs += hw/pci-host
 trace-events-subdirs += hw/ppc
+trace-events-subdirs += hw/riscv
 trace-events-subdirs += hw/rdma
 trace-events-subdirs += hw/rdma/vmw
 trace-events-subdirs += hw/s390x

diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs
@@ -2,6 +2,7 @@ obj-y += boot.o
 obj-y += riscv_htif.o
 obj-y += riscv_hart.o
 obj-y += sifive_e.o
+obj-y += sifive_clic.o
 obj-y += sifive_clint.o
 obj-y += sifive_prci.o
 obj-y += sifive_plic.o