From c9593f11c890e1f109cf7c324f289ec50fd6c714 Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Tue, 28 Feb 2023 09:12:19 +0100
Subject: [PATCH] Config verilator lint to ignore known 3rd-party warnings; let
 warnings be fatal

Signed-off-by: Daniel Lublin <daniel@lublin.se>
---
 .github/workflows/ci.yaml      |  1 -
 hw/application_fpga/Makefile   | 10 +++++++---
 hw/application_fpga/config.vlt |  4 ++++
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 hw/application_fpga/config.vlt

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fef0e73..d21f610 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -44,7 +44,6 @@ jobs:
           make -C fw/tk1 checkfmt
           make -C fw/testfw checkfmt
 
-      # this should to fail on errors, but not on warnings (using -Wno-fatal)
       - name: lint verilog using verilator
         working-directory: hw/application_fpga
         run: make lint
diff --git a/hw/application_fpga/Makefile b/hw/application_fpga/Makefile
index e666bf7..eaa6d29 100644
--- a/hw/application_fpga/Makefile
+++ b/hw/application_fpga/Makefile
@@ -6,7 +6,7 @@
 # HW targets as well as its firmware.
 #
 #
-# Copyright (C) 2022 - Tillitis AB
+# Copyright (C) 2022, 2023 - Tillitis AB
 # SPDX-License-Identifier: GPL-2.0-only
 #
 #=======================================================================
@@ -147,7 +147,7 @@ testfw.hex: testfw.bin testfw_size_mismatch
 # Source linting.
 #-------------------------------------------------------------------
 LINT=verilator
-LINT_FLAGS = +1364-2001ext+ --lint-only  -Wall -Wno-fatal -Wno-DECLFILENAME \
+LINT_FLAGS = +1364-2001ext+ --lint-only  -Wall -Wno-DECLFILENAME \
 	--timescale 1ns/1ns -DNO_ICE40_DEFAULT_ASSIGNMENTS
 
 lint: $(FPGA_SRC) $(VERILOG_SRCS) $(ICE40_SIM_CELLS)
@@ -156,7 +156,11 @@ lint: $(FPGA_SRC) $(VERILOG_SRCS) $(ICE40_SIM_CELLS)
 	-DFIRMWARE_HEX=\"$(P)/firmware.hex\" \
 	-DUDS_HEX=\"$(P)/data/uds.hex\" \
 	-DUDI_HEX=\"$(P)/data/udi.hex\" \
-	--top-module application_fpga $^ &> lint_issues.txt
+	--top-module application_fpga \
+	config.vlt $^ \
+	>lint_issues.txt 2>&1 \
+	&& { rm -f lint_issues.txt; exit 0; } \
+	|| {   cat lint_issues.txt; exit 1; }
 .PHONY: lint
 
 
diff --git a/hw/application_fpga/config.vlt b/hw/application_fpga/config.vlt
new file mode 100644
index 0000000..f2d8a97
--- /dev/null
+++ b/hw/application_fpga/config.vlt
@@ -0,0 +1,4 @@
+`verilator_config
+lint_off -rule UNUSED   -file "*/ice40/cells_sim.v"
+lint_off -rule UNDRIVEN -file "*/ice40/cells_sim.v"
+lint_off -rule BLKSEQ -file "*/picorv32.v"