From d94a7392366b1e1563f0bb4d1df833bca411a077 Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Thu, 24 Aug 2023 05:21:15 -0700
Subject: [PATCH] ??? on synthesis Makefile

---
 synthDC/Makefile | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/synthDC/Makefile b/synthDC/Makefile
index ea3cdda47..64dd497a7 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -69,26 +69,15 @@ endif
 ifeq ($(USESRAM), 1)
 	sed -i 's/USE_SRAM.*/USE_SRAM = 1;/g' $(CONFIGDIR)/config.vh
 else
-<<<<<<< HEAD
-	sed -i 's/WAYSIZEINBYTES.*/WAYSIZEINBYTES = 512;/g' $(CONFIGDIR)/config.vh
-	sed -i 's/NUMWAYS.*/NUMWAYS = 1;/g' $(CONFIGDIR)/config.vh
-	sed -i 's/BPRED_SIZE.*/BPRED_SIZE = 5;/g' $(CONFIGDIR)/config.vh
-	sed -i 's/BTB_SIZE.*/BTB_SIZE = 5;/g' $(CONFIGDIR)/config.vh
-=======
 	sed -i "s/WAYSIZEINBYTES.*/WAYSIZEINBYTES = 32\'d512;/g" $(CONFIGDIR)/config.vh
 	sed -i "s/NUMWAYS.*/NUMWAYS =32\'d1;/g" $(CONFIGDIR)/config.vh
 	sed -i "s/BPRED_SIZE.*/BPRED_SIZE =32\'d5;/g" $(CONFIGDIR)/config.vh
 	sed -i "s/BTB_SIZE.*/BTB_SIZE = 32\'d5;/g" $(CONFIGDIR)/config.vh
->>>>>>> dcef4cc9cee704ec78c6c5118bb769405cedc499
 ifneq ($(filter $(CONFIG), $(DIRS32)),)
 	sed -i "s/BOOTROM_RANGE.*/BOOTROM_RANGE	 = 34\'h01FF;/g" $(CONFIGDIR)/config.vh
 	sed -i "s/UNCORE_RAM_RANGE.*/UNCORE_RAM_RANGE	= 34\'h01FF;/g" $(CONFIGDIR)/config.vh
 else ifneq ($(filter $(CONFIG), $(DIRS64)),)
-<<<<<<< HEAD
-	sed -i "s/BOOTROM_RANGE.*/BOOTROM_RANGE	= 56\'h01FF;/g" $(CONFIGDIR)/config.vh
-=======
 	sed -i "s/BOOTROM_RANGE.*/BOOTROM_RANGE	 = 56\'h01FF;/g" $(CONFIGDIR)/config.vh
->>>>>>> dcef4cc9cee704ec78c6c5118bb769405cedc499
 	sed -i "s/UNCORE_RAM_RANGE.*/UNCORE_RAM_RANGE	= 56\'h01FF;/g" $(CONFIGDIR)/config.vh
 endif
 endif