Added CC_FLAGS and LINT_FLAGS.

1 files changed, 26 insertions, 24 deletions

diff --git a/toolruns/Makefile b/toolruns/Makefile
index 835a92f..8408abd 100755
--- a/toolruns/Makefile
+++ b/toolruns/Makefile
@@ -37,44 +37,51 @@
 #
 #===================================================================
 
-SBOX_SRC=../src/rtl/aes_sbox.v
-INV_SBOX_SRC=../src/rtl/aes_inv_sbox.v
-KEYMEM_SRC=../src/rtl/aes_key_mem.v
-ENCIPHER_SRC=../src/rtl/aes_encipher_block.v
-DECIPHER_SRC=../src/rtl/aes_decipher_block.v
-CORE_SRC=../src/rtl/aes_core.v $(KEYMEM_SRC) $(SBOX_SRC) $(INV_SBOX_SRC) $(ENCIPHER_SRC) $(DECIPHER_SRC)
-TOP_SRC=../src/rtl/aes.v $(CORE_SRC)
+SBOX_SRC = ../src/rtl/aes_sbox.v
+INV_SBOX_SRC = ../src/rtl/aes_inv_sbox.v
+KEYMEM_SRC = ../src/rtl/aes_key_mem.v
+ENCIPHER_SRC = ../src/rtl/aes_encipher_block.v
+DECIPHER_SRC = ../src/rtl/aes_decipher_block.v
+CORE_SRC = ../src/rtl/aes_core.v $(KEYMEM_SRC) $(SBOX_SRC) $(INV_SBOX_SRC) $(ENCIPHER_SRC) $(DECIPHER_SRC)
+TOP_SRC = ../src/rtl/aes.v $(CORE_SRC)
 
-TB_TOP_SRC =../src/tb/tb_aes.v
-TB_CORE_SRC =../src/tb/tb_aes_core.v
-TB_KEYMEM_SRC =../src/tb/tb_aes_key_mem.v
-TB_ENCIPHER_SRC =../src/tb/tb_aes_encipher_block.v
-TB_DECIPHER_SRC =../src/tb/tb_aes_decipher_block.v
+TB_TOP_SRC = ../src/tb/tb_aes.v
+TB_CORE_SRC = ../src/tb/tb_aes_core.v
+TB_KEYMEM_SRC = ../src/tb/tb_aes_key_mem.v
+TB_ENCIPHER_SRC = ../src/tb/tb_aes_encipher_block.v
+TB_DECIPHER_SRC = ../src/tb/tb_aes_decipher_block.v
 
-CC=iverilog
-LINT=verilator
+CC = iverilog
+CC_FLAGS = -Wall
+
+LINT = verilator
+LINT_FLAGS = +1364-2001ext+ --lint-only  -Wall -Wno-fatal -Wno-DECLFILENAME
 
 
 all: top.sim core.sim keymem.sim encipher.sim decipher.sim
 
 top.sim: $(TB_TOP_SRC) $(TOP_SRC)
-	$(CC) -o top.sim $(TB_TOP_SRC) $(TOP_SRC)
+	$(CC) $(CC_FLAGS) -o top.sim $(TB_TOP_SRC) $(TOP_SRC)
 
 
 core.sim: $(TB_CORE_SRC) $(CORE_SRC)
-	$(CC) -o core.sim $(TB_CORE_SRC) $(CORE_SRC)
+	$(CC) $(CC_FLAGS) -o core.sim $(TB_CORE_SRC) $(CORE_SRC)
 
 
 keymem.sim:  $(TB_KEYMEM_SRC) $(KEYGEN_SRC) $(SBOX_SRC)
-	$(CC) -o keymem.sim $(TB_KEYMEM_SRC) $(KEYMEM_SRC) $(SBOX_SRC)
+	$(CC) $(CC_FLAGS) -o keymem.sim $(TB_KEYMEM_SRC) $(KEYMEM_SRC) $(SBOX_SRC)
 
 
 encipher.sim:  $(TB_ENCIPHER_SRC) $(ENCIPHER_SRC) $(SBOX_SRC)
-	$(CC) -o encipher.sim $(TB_ENCIPHER_SRC) $(ENCIPHER_SRC) $(SBOX_SRC)
+	$(CC) $(CC_FLAGS) -o encipher.sim $(TB_ENCIPHER_SRC) $(ENCIPHER_SRC) $(SBOX_SRC)
 
 
 decipher.sim:  $(TB_DECIPHER_SRC) $(DECIPHER_SRC) $(INV_SBOX_SRC)
-	$(CC) -o decipher.sim $(TB_DECIPHER_SRC) $(DECIPHER_SRC) $(INV_SBOX_SRC)
+	$(CC) $(CC_FLAGS) -o decipher.sim $(TB_DECIPHER_SRC) $(DECIPHER_SRC) $(INV_SBOX_SRC)
+
+
+lint:  $(TOP_SRC)
+	$(LINT) $(LINT_FLAGS) $(TOP_SRC)
 
 
 sim-keymem: keymem.sim
@@ -96,11 +103,6 @@ sim-core: core.sim
 sim-top: top.sim
 	./top.sim
 
-
-lint:
-	verilator +1364-2001ext+ --lint-only -Wall $(TOP_SRC)
-
-
 clean:
 	rm -f decipher.sim
 	rm -f encipher.sim