From 57456ababbaf6e8ca80fb0b8f5b7fac0b4c68082 Mon Sep 17 00:00:00 2001
From: Marco Bertuletti <mbertuletti@iis.ee.ethz.ch>
Date: Mon, 28 Aug 2023 11:01:21 +0200
Subject: [PATCH] [hardware] Clean up of defines

---
 config/mempool_fpu.mk | 30 ------------------------------
 config/minpool_fpu.mk | 34 ----------------------------------
 hardware/Makefile     |  7 ++++---
 3 files changed, 4 insertions(+), 67 deletions(-)
 delete mode 100644 config/mempool_fpu.mk
 delete mode 100644 config/minpool_fpu.mk

diff --git a/config/mempool_fpu.mk b/config/mempool_fpu.mk
deleted file mode 100644
index f0299ff21..000000000
--- a/config/mempool_fpu.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 ETH Zurich and University of Bologna.
-# Licensed under the Apache License, Version 2.0, see LICENSE for details.
-# SPDX-License-Identifier: Apache-2.0
-
-# Author: Matheus Cavalcante, ETH Zurich
-
-###############
-##  MemPool  ##
-###############
-
-# Number of cores
-num_cores ?= 256
-
-# Number of groups
-num_groups ?= 4
-
-# Number of cores per MemPool tile
-num_cores_per_tile ?= 4
-
-# L1 scratchpad banking factor
-banking_factor ?= 4
-
-# Radix for hierarchical AXI interconnect
-axi_hier_radix ?= 20
-
-# Number of AXI masters per group
-axi_masters_per_group ?= 1
-
-# Activate the FPU
-fpu ?= 1
diff --git a/config/minpool_fpu.mk b/config/minpool_fpu.mk
deleted file mode 100644
index 7bbd3fadc..000000000
--- a/config/minpool_fpu.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 ETH Zurich and University of Bologna.
-# Licensed under the Apache License, Version 2.0, see LICENSE for details.
-# SPDX-License-Identifier: Apache-2.0
-
-# Author: Matheus Cavalcante, ETH Zurich
-
-###################
-##  MinPool FPU  ##
-###################
-
-# Number of cores
-num_cores ?= 16
-
-# Number of groups
-num_groups ?= 4
-
-# Number of cores per MemPool tile
-num_cores_per_tile ?= 4
-
-# L1 scratchpad banking factor
-banking_factor ?= 4
-
-# Number of DMA backends in each group
-dmas_per_group ?= 1
-
-# Radix for hierarchical AXI interconnect
-axi_hier_radix ?= 2
-
-# Number of AXI masters per group
-axi_masters_per_group ?= 1
-
-# Activate the FPU
-fpu ?= 1
-
diff --git a/hardware/Makefile b/hardware/Makefile
index 1f08ad91f..e06f755da 100644
--- a/hardware/Makefile
+++ b/hardware/Makefile
@@ -89,12 +89,13 @@ vlog_args += -work $(library)
 # Defines
 vlog_defs += -DNUM_CORES=$(num_cores) -DNUM_CORES_PER_TILE=$(num_cores_per_tile) -DNUM_GROUPS=$(num_groups) -DBANKING_FACTOR=$(banking_factor)
 vlog_defs += -DL2_BASE=$(l2_base) -DL2_SIZE=$(l2_size) -DL2_BANKS=$(l2_banks)
-vlog_defs += -DBOOT_ADDR=$(boot_addr) -DXPULPIMG=$(xpulpimg)
+vlog_defs += -DBOOT_ADDR=$(boot_addr)
+vlog_defs += -DXPULPIMG=$(xpulpimg)
+vlog_defs += -DZFINX_RV=$(zfinx_rv)
 vlog_defs += -DSNITCH_TRACE=$(snitch_trace)
 vlog_defs += -DAXI_DATA_WIDTH=$(axi_data_width)
 vlog_defs += -DRO_LINE_WIDTH=$(ro_line_width)
 vlog_defs += -DDMAS_PER_GROUP=$(dmas_per_group)
-vlog_defs += -DZFINX_RV=$(zfinx_rv)
 vlog_defs += -DAXI_HIER_RADIX=$(axi_hier_radix) -DAXI_MASTERS_PER_GROUP=$(axi_masters_per_group)
 vlog_defs += -DSEQ_MEM_SIZE=$(seq_mem_size) -DXQUEUE_SIZE=$(xqueue_size)
 
@@ -116,7 +117,7 @@ cpp_defs += -DL2_BASE=$(l2_base)
 cpp_defs += -DL2_SIZE=$(l2_size)
 cpp_defs += -DL2_BANKS=$(l2_banks)
 cpp_defs += -DAXI_DATA_WIDTH=$(axi_data_width)
-cpp_defs  += -DFPU=$(fpu) -DL2_BASE=$(l2_base) -DL2_SIZE=$(l2_size) -DL2_BANKS=$(l2_banks)
+cpp_defs  += -DL2_BASE=$(l2_base) -DL2_SIZE=$(l2_size) -DL2_BANKS=$(l2_banks)
 
 .DEFAULT_GOAL := compile