From 7e0e4555f92c57338391747dc48e48c6b9ec1ac5 Mon Sep 17 00:00:00 2001
From: Colin Schmidt <colins@eecs.berkeley.edu>
Date: Wed, 27 May 2020 10:50:53 -0700
Subject: [PATCH] Remove redundancy in flags after merge

---
 vcs.mk        | 3 ---
 vlsi/Makefile | 1 -
 2 files changed, 4 deletions(-)

diff --git a/vcs.mk b/vcs.mk
index 5851e98c..96cd0636 100644
--- a/vcs.mk
+++ b/vcs.mk
@@ -1,6 +1,3 @@
-PERMISSIVE_ON=+permissive
-PERMISSIVE_OFF=+permissive-off
-
 WAVEFORM_FLAG=+vcdplusfile=$(sim_out_name).vpd
 
 CLOCK_PERIOD ?= 1.0
diff --git a/vlsi/Makefile b/vlsi/Makefile
index cd2d3d91..66813871 100644
--- a/vlsi/Makefile
+++ b/vlsi/Makefile
@@ -124,7 +124,6 @@ $(SIM_CONF): $(VLSI_RTL) $(HARNESS_FILE) $(HARNESS_SMEMS_FILE) $(sim_common_file
 	echo "  execution_flags_prepend: ['$(PERMISSIVE_ON)']" >> $@
 	echo "  execution_flags_append: ['$(PERMISSIVE_OFF)']" >> $@
 	echo "  execution_flags:" >> $@
-	echo "    - '+max-cycles=$(timeout_cycles)'" >> $@
 	for x in $(SIM_FLAGS); do \
 	  echo '    - "'$$x'"' >> $@; \
 	done