From: Luke Kenneth Casson Leighton Date: Sat, 28 Jul 2018 08:59:17 +0000 (+0100) Subject: replace defined_parameters with instance_defines X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2cb43799f59cc22a38b335d0eebf3ab62bb0fab5;p=shakti-peripherals.git replace defined_parameters with instance_defines --- diff --git a/src/peripherals/bootrom/BootRom.bsv b/src/peripherals/bootrom/BootRom.bsv index cd67f37..04f185b 100644 --- a/src/peripherals/bootrom/BootRom.bsv +++ b/src/peripherals/bootrom/BootRom.bsv @@ -13,7 +13,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND */ package BootRom; import defined_types::*; - `include "defined_parameters.bsv" + `include "instance_defines.bsv" import BRAMCore :: *; import DReg::*; import Semi_FIFOF :: *; diff --git a/src/peripherals/clint/clint.bsv b/src/peripherals/clint/clint.bsv index cdd4f4f..270ec0f 100644 --- a/src/peripherals/clint/clint.bsv +++ b/src/peripherals/clint/clint.bsv @@ -21,7 +21,7 @@ package clint; /*======================== */ /*==== Project imports ====*/ import defined_types::*; - `include "defined_parameters.bsv" + `include "instance_defines.bsv" /*=========================*/ interface Ifc_clint; diff --git a/src/peripherals/dma/DMA.bsv b/src/peripherals/dma/DMA.bsv index ac51120..3d1cced 100644 --- a/src/peripherals/dma/DMA.bsv +++ b/src/peripherals/dma/DMA.bsv @@ -38,7 +38,7 @@ import ConcatReg :: *; import ConfigReg :: *; `define Burst_length_bits 8 -`include "defined_parameters.bsv" +`include "instance_defines.bsv" `define verbose // ================================================================ // DMA requests and responses parameters diff --git a/src/peripherals/dma/tb_DMA.bsv b/src/peripherals/dma/tb_DMA.bsv index d0a085f..1dc7245 100644 --- a/src/peripherals/dma/tb_DMA.bsv +++ b/src/peripherals/dma/tb_DMA.bsv @@ -23,7 +23,7 @@ package tb_DMA; import Clocks :: * ; import DReg ::*; import defined_types::*; - `include "defined_parameters.bsv" + `include "instance_defines.bsv" `define Num_DMA_Channels 7 diff --git a/src/peripherals/dma/tb_DMA_AXI_Memory.bsv b/src/peripherals/dma/tb_DMA_AXI_Memory.bsv index 7c070ef..7701a6c 100644 --- a/src/peripherals/dma/tb_DMA_AXI_Memory.bsv +++ b/src/peripherals/dma/tb_DMA_AXI_Memory.bsv @@ -23,7 +23,7 @@ package tb_DMA_AXI_Memory; import RegFile::*; import Clocks :: * ; import DReg ::*; - `include "defined_parameters.bsv" + `include "instance_defines.bsv" typedef 2 Num_Masters; typedef 3 Num_Slaves; diff --git a/src/peripherals/sdram/sdr_top.bsv b/src/peripherals/sdram/sdr_top.bsv index a33e06d..ec1d821 100644 --- a/src/peripherals/sdram/sdr_top.bsv +++ b/src/peripherals/sdram/sdr_top.bsv @@ -12,7 +12,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ -`include "defined_parameters.bsv" +`include "instance_defines.bsv" `define DELAY 250 `define SDR_RFSH_TIMER_W 12 `define SDR_RFSH_ROW_CNT_W 3 diff --git a/src/peripherals/sdram/tb_bsv_wrapper.bsv b/src/peripherals/sdram/tb_bsv_wrapper.bsv index a834b29..38f1042 100644 --- a/src/peripherals/sdram/tb_bsv_wrapper.bsv +++ b/src/peripherals/sdram/tb_bsv_wrapper.bsv @@ -18,7 +18,7 @@ import AXI4_Types :: *; import AXI4_Fabric :: *; import bsvmksdram_model_wrapper :: *; import Connectable :: *; -`include "defined_parameters.bsv" +`include "instance_defines.bsv" `define DELAY 10200 diff --git a/src/peripherals/sdram/tb_top.bsv b/src/peripherals/sdram/tb_top.bsv index 8e920a0..4cba921 100644 --- a/src/peripherals/sdram/tb_top.bsv +++ b/src/peripherals/sdram/tb_top.bsv @@ -19,7 +19,7 @@ import AXI4_Fabric :: *; import sdr_top :: *; import tb_bsv_wrapper :: *; import Connectable :: *; -`include "defined_parameters.bsv" +`include "instance_defines.bsv" typedef 1 Num_Masters; diff --git a/src/peripherals/tdm/TCM.bsv b/src/peripherals/tdm/TCM.bsv index a9b48cd..1ec417c 100644 --- a/src/peripherals/tdm/TCM.bsv +++ b/src/peripherals/tdm/TCM.bsv @@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND package TCM; /*====== Porject imports ====*/ import defined_types::*; - `include "defined_parameters.bsv" + `include "instance_defines.bsv" import Semi_FIFOF :: *; import AXI4_Types :: *; import AXI4_Fabric :: *; diff --git a/src/peripherals/vme/Memory_vme_16.bsv b/src/peripherals/vme/Memory_vme_16.bsv index 234cc5e..57c614f 100644 --- a/src/peripherals/vme/Memory_vme_16.bsv +++ b/src/peripherals/vme/Memory_vme_16.bsv @@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND package Memory_vme_16; import defined_types::*; - `include "defined_parameters.bsv" + `include "instance_defines.bsv" import BRAMCore :: *; // import TriState ::*; // import DReg::*; diff --git a/src/peripherals/vme/Memory_vme_32.bsv b/src/peripherals/vme/Memory_vme_32.bsv index d5ee3b1..d228c47 100644 --- a/src/peripherals/vme/Memory_vme_32.bsv +++ b/src/peripherals/vme/Memory_vme_32.bsv @@ -16,7 +16,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND package Memory_vme_32; import defined_types::*; - `include "defined_parameters.bsv" + `include "instance_defines.bsv" import BRAMCore :: *; `include "vme_parameters.bsv" diff --git a/src/peripherals/vme/Memory_vme_8.bsv b/src/peripherals/vme/Memory_vme_8.bsv index e8bb898..502ecd7 100644 --- a/src/peripherals/vme/Memory_vme_8.bsv +++ b/src/peripherals/vme/Memory_vme_8.bsv @@ -15,7 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND package Memory_vme_8; import defined_types::*; - `include "defined_parameters.bsv" + `include "instance_defines.bsv" import BRAMCore :: *; diff --git a/src/peripherals/vme/vme_top.bsv b/src/peripherals/vme/vme_top.bsv index 502e0d8..bc0428f 100644 --- a/src/peripherals/vme/vme_top.bsv +++ b/src/peripherals/vme/vme_top.bsv @@ -29,7 +29,7 @@ package vme_top; /*========= Project imports ======== */ `include "vme_parameters.bsv" - `include "defined_parameters.bsv" + `include "instance_defines.bsv" import defined_types ::*; import FIFOF ::*; import vme_master :: *; diff --git a/src/uncore/debug/DebugModule.bsv b/src/uncore/debug/DebugModule.bsv index 75636cc..8b2807c 100644 --- a/src/uncore/debug/DebugModule.bsv +++ b/src/uncore/debug/DebugModule.bsv @@ -29,7 +29,7 @@ package DebugModule; import AXI4_Types::*; import AXI4_Fabric::*; `include "defines.bsv" - `include "defined_parameters.bsv" + `include "instance_defines.bsv" import defined_types::*; import core :: *; /*========================= */ diff --git a/src/uncore/tilelink/TLMemoryMap.bsv b/src/uncore/tilelink/TLMemoryMap.bsv index 7c5823d..542ff47 100644 --- a/src/uncore/tilelink/TLMemoryMap.bsv +++ b/src/uncore/tilelink/TLMemoryMap.bsv @@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND package MemoryMap; /*=== Project imports ==== */ import defined_types::*; - `include "defined_parameters.bsv" + `include "instance_defines.bsv" /*========================= */