From 277c76d7fb1e50997251488c66c9b6d45d2e82e5 Mon Sep 17 00:00:00 2001
From: Greg Chadwick <gac@lowrisc.org>
Date: Wed, 4 Dec 2019 16:33:00 +0000
Subject: [PATCH] Misc fixes

---
 hw/vendor/lowrisc_ibex/rtl/ibex_core.sv       | 28 +++++++++----------
 .../opentitan/device/rv32imc/Makefile.include |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/hw/vendor/lowrisc_ibex/rtl/ibex_core.sv b/hw/vendor/lowrisc_ibex/rtl/ibex_core.sv
index fcd03ebdf7699..0ca2b7b98f597 100644
--- a/hw/vendor/lowrisc_ibex/rtl/ibex_core.sv
+++ b/hw/vendor/lowrisc_ibex/rtl/ibex_core.sv
@@ -704,20 +704,20 @@ module ibex_core #(
   // * Mem IF
   // - Addr + req/gnt
   // - Data + valid
-  ibex_ila ila_i (
-	  .clk(clk),
-
-	  .probe0(id_stage_i.regfile_raddr_a), // input wire [4:0]  probe0
-	  .probe1(id_stage_i.regfile_raddr_b), // input wire [4:0]  probe1
-	  .probe2({id_stage_i.regfile_we, id_stage_i.regfile_waddr}), // input wire [5:0]  probe2
-	  .probe3(id_stage_i.regfile_rdata_a), // input wire [31:0]  probe3
-	  .probe4(id_stage_i.regfile_rdata_b), // input wire [31:0]  probe4
-	  .probe5(id_stage_i.regfile_wdata), // input wire [31:0]  probe5
-	  .probe6({instr_new_id, instr_valid_id, pc_id}), // input wire [33:0]  probe6
-	  .probe7(instr_rdata_id), // input wire [31:0]  probe7
-	  .probe8({data_we_o, data_req_o, data_gnt_o, data_addr_o}), // input wire [33:0]  probe8
-	  .probe9({data_rvalid_i, data_rdata_i}) // input wire [32:0]  probe9
-  );
+  //ibex_ila ila_i (
+	//  .clk(clk),
+
+	//  .probe0(id_stage_i.regfile_raddr_a), // input wire [4:0]  probe0
+	//  .probe1(id_stage_i.regfile_raddr_b), // input wire [4:0]  probe1
+	//  .probe2({id_stage_i.regfile_we, id_stage_i.regfile_waddr}), // input wire [5:0]  probe2
+	//  .probe3(id_stage_i.regfile_rdata_a), // input wire [31:0]  probe3
+	//  .probe4(id_stage_i.regfile_rdata_b), // input wire [31:0]  probe4
+	//  .probe5(id_stage_i.regfile_wdata), // input wire [31:0]  probe5
+	//  .probe6({instr_new_id, instr_valid_id, pc_id}), // input wire [33:0]  probe6
+	//  .probe7(instr_rdata_id), // input wire [31:0]  probe7
+	//  .probe8({data_we_o, data_req_o, data_gnt_o, data_addr_o}), // input wire [33:0]  probe8
+	//  .probe9({data_rvalid_i, data_rdata_i}) // input wire [32:0]  probe9
+  //);
 
 `ifdef RVFI
   always_ff @(posedge clk or negedge rst_ni) begin
diff --git a/sw/vendor/riscv_compliance/riscv-target/opentitan/device/rv32imc/Makefile.include b/sw/vendor/riscv_compliance/riscv-target/opentitan/device/rv32imc/Makefile.include
index 370ec9335cc20..968bc8e93937d 100644
--- a/sw/vendor/riscv_compliance/riscv-target/opentitan/device/rv32imc/Makefile.include
+++ b/sw/vendor/riscv_compliance/riscv-target/opentitan/device/rv32imc/Makefile.include
@@ -60,7 +60,7 @@ COMPILE_TARGET=\
 	$$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \
 		-I$(ROOTDIR)/riscv-test-env/ \
 		-I$(ROOTDIR)/riscv-test-env/p/ \
-                -I$(OT_SW)/boot_rom/lib \
+                -I$(OT_BUILD)/examples/hello_world/lib \
                 -I$(OT_SW)/lib \
 		-I$(TARGETDIR)/$(RISCV_TARGET)/ \
 		-I$(TARGETDIR)/$(RISCV_TARGET)/ \