Update the kelvin_hw_verilog target

Generate kelvin.v matches the syntax of the checked-in verilog

Change-Id: Idae5d4265735be544b9a28a386a65e9881f3ef52

platforms/nexus/kelvin.mk

diff --git a/platforms/nexus/kelvin.mk b/platforms/nexus/kelvin.mk
index 8e4a348..ff47804 100644
--- a/platforms/nexus/kelvin.mk
+++ b/platforms/nexus/kelvin.mk
@@ -65,10 +65,13 @@
 	mkdir -p "$(KELVIN_HW_TESTLOG_DIR)"
 
 ## Verilog Source for Kelvin
-kelvin_hw_verilog: | $(KELVIN_HW_OUT_DIR)
+#
+# This generates the kelvin.v file that can be used to update hw/matcha
+kelvin_hw_verilog: | $(KELVIN_HW_BAZEL_OUT_DIR)
 	cd "$(KELVIN_HW_SRC_DIR)" && \
-		bazel build //hdl/chisel:kelvin_cc_library_emit_verilog && \
-		cp -rf bazel-bin/hdl/chisel/Kelvin.v "$(KELVIN_HW_BAZEL_OUT_DIR)"
+		bazel clean --expunge && \
+			bazel build //hdl/chisel:matcha_kelvin_verilog && \
+		cp -rf bazel-bin/hdl/chisel/kelvin.v "$(KELVIN_HW_BAZEL_OUT_DIR)"
 
 ## Verilated Kelvin HW simulator
 kelvin_hw_sim: | $(KELVIN_HW_OUT_DIR)

platforms/shodan/kelvin.mk

diff --git a/platforms/shodan/kelvin.mk b/platforms/shodan/kelvin.mk
index 8bd67e8..6fc69f8 100644
--- a/platforms/shodan/kelvin.mk
+++ b/platforms/shodan/kelvin.mk
@@ -53,10 +53,13 @@
 	mkdir -p "$(KELVIN_HW_TESTLOG_DIR)"
 
 ## Verilog Source for Kelvin
+#
+# This generates the kelvin.v file that can be used to update hw/matcha
 kelvin_hw_verilog: | $(KELVIN_HW_BAZEL_OUT_DIR)
 	cd "$(KELVIN_HW_SRC_DIR)" && \
-		bazel build //hdl/chisel:kelvin_cc_library_emit_verilog && \
-		cp -rf bazel-bin/hdl/chisel/Kelvin.v "$(KELVIN_HW_BAZEL_OUT_DIR)"
+		bazel clean --expunge && \
+			bazel build //hdl/chisel:matcha_kelvin_verilog && \
+		cp -rf bazel-bin/hdl/chisel/kelvin.v "$(KELVIN_HW_BAZEL_OUT_DIR)"
 
 ## Verilated Kelvin HW simulator
 kelvin_hw_sim: | $(KELVIN_HW_BAZEL_OUT_DIR)