mirror of
https://github.com/openhwgroup/cvw
synced 2025-02-11 06:05:49 +00:00
Removed unused wallypipelinedsocwrapper
This commit is contained in:
parent
8c6ddcc15b
commit
bfd47ff7f5
@ -10,7 +10,6 @@
|
|||||||
// Note: the CSRs do not support the following features
|
// Note: the CSRs do not support the following features
|
||||||
//- Disabling portions of the instruction set with bits of the MISA register
|
//- Disabling portions of the instruction set with bits of the MISA register
|
||||||
//- Changing from RV64 to RV32 by writing the SXL/UXL bits of the STATUS register
|
//- Changing from RV64 to RV32 by writing the SXL/UXL bits of the STATUS register
|
||||||
// As of January 2020, virtual memory is not yet supported
|
|
||||||
//
|
//
|
||||||
// A component of the CORE-V-WALLY configurable RISC-V project.
|
// A component of the CORE-V-WALLY configurable RISC-V project.
|
||||||
//
|
//
|
||||||
@ -35,8 +34,7 @@
|
|||||||
module wallypipelinedsoc (
|
module wallypipelinedsoc (
|
||||||
input logic clk, reset_ext,
|
input logic clk, reset_ext,
|
||||||
output logic reset,
|
output logic reset,
|
||||||
// AHB Lite Interface
|
// AHB Interface
|
||||||
// inputs from external memory
|
|
||||||
input logic [`AHBW-1:0] HRDATAEXT,
|
input logic [`AHBW-1:0] HRDATAEXT,
|
||||||
input logic HREADYEXT, HRESPEXT,
|
input logic HREADYEXT, HRESPEXT,
|
||||||
output logic HSELEXT,
|
output logic HSELEXT,
|
||||||
@ -66,7 +64,6 @@ module wallypipelinedsoc (
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Uncore signals
|
// Uncore signals
|
||||||
// logic reset;
|
|
||||||
logic [`AHBW-1:0] HRDATA; // from AHB mux in uncore
|
logic [`AHBW-1:0] HRDATA; // from AHB mux in uncore
|
||||||
logic HRESP;
|
logic HRESP;
|
||||||
logic MTimerInt, MSwInt; // from CLINT
|
logic MTimerInt, MSwInt; // from CLINT
|
||||||
@ -76,14 +73,14 @@ module wallypipelinedsoc (
|
|||||||
// synchronize reset to SOC clock domain
|
// synchronize reset to SOC clock domain
|
||||||
synchronizer resetsync(.clk, .d(reset_ext), .q(reset));
|
synchronizer resetsync(.clk, .d(reset_ext), .q(reset));
|
||||||
|
|
||||||
// instantiate processor and memories
|
// instantiate processor and internal memories
|
||||||
wallypipelinedcore core(.clk, .reset,
|
wallypipelinedcore core(.clk, .reset,
|
||||||
.MTimerInt, .MExtInt, .SExtInt, .MSwInt,
|
.MTimerInt, .MExtInt, .SExtInt, .MSwInt, .MTIME_CLINT,
|
||||||
.MTIME_CLINT,
|
|
||||||
.HRDATA, .HREADY, .HRESP, .HCLK, .HRESETn, .HADDR, .HWDATA, .HWSTRB,
|
.HRDATA, .HREADY, .HRESP, .HCLK, .HRESETn, .HADDR, .HWDATA, .HWSTRB,
|
||||||
.HWRITE, .HSIZE, .HBURST, .HPROT, .HTRANS, .HMASTLOCK
|
.HWRITE, .HSIZE, .HBURST, .HPROT, .HTRANS, .HMASTLOCK
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// instantiate uncore if a bus interface exists
|
||||||
if (`BUS) begin : uncore
|
if (`BUS) begin : uncore
|
||||||
uncore uncore(.HCLK, .HRESETn, .TIMECLK,
|
uncore uncore(.HCLK, .HRESETn, .TIMECLK,
|
||||||
.HADDR, .HWDATA, .HWSTRB, .HWRITE, .HSIZE, .HBURST, .HPROT, .HTRANS, .HMASTLOCK, .HRDATAEXT,
|
.HADDR, .HWDATA, .HWSTRB, .HWRITE, .HSIZE, .HBURST, .HPROT, .HTRANS, .HMASTLOCK, .HRDATAEXT,
|
||||||
|
@ -1,75 +0,0 @@
|
|||||||
///////////////////////////////////////////
|
|
||||||
// wally-pipelinedsoc.sv
|
|
||||||
//
|
|
||||||
// Written: David_Harris@hmc.edu 6 November 2020
|
|
||||||
// Modified:
|
|
||||||
//
|
|
||||||
// Purpose: System on chip including pipelined processor and memories
|
|
||||||
// Full RV32/64IC instruction set
|
|
||||||
//
|
|
||||||
// Note: the CSRs do not support the following features
|
|
||||||
//- Disabling portions of the instruction set with bits of the MISA register
|
|
||||||
//- Changing from RV64 to RV32 by writing the SXL/UXL bits of the STATUS register
|
|
||||||
// As of January 2020, virtual memory is not yet supported
|
|
||||||
//
|
|
||||||
// A component of the CORE-V-WALLY configurable RISC-V project.
|
|
||||||
//
|
|
||||||
// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
|
|
||||||
//
|
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
|
|
||||||
// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
|
|
||||||
// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
|
|
||||||
// is furnished to do so, subject to the following conditions:
|
|
||||||
//
|
|
||||||
// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
|
||||||
//
|
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
||||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
|
|
||||||
// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
///////////////////////////////////////////
|
|
||||||
|
|
||||||
`include "wally-config.vh"
|
|
||||||
|
|
||||||
module wallypipelinedsocwrapper (
|
|
||||||
input clk, reset,
|
|
||||||
// AHB Lite Interface
|
|
||||||
// inputs from external memory
|
|
||||||
input [`AHBW-1:0] HRDATAEXT,
|
|
||||||
input HREADYEXT, HRESPEXT,
|
|
||||||
output HSELEXT,
|
|
||||||
// outputs to external memory, shared with uncore memory
|
|
||||||
output HCLK, HRESETn,
|
|
||||||
output [31:0] HADDR,
|
|
||||||
output [`AHBW-1:0] HWDATA,
|
|
||||||
output [`XLEN/8-1:0] HWSTRB,
|
|
||||||
output HWRITE,
|
|
||||||
output [2:0] HSIZE,
|
|
||||||
output [2:0] HBURST,
|
|
||||||
output [3:0] HPROT,
|
|
||||||
output [1:0] HTRANS,
|
|
||||||
output HMASTLOCK,
|
|
||||||
output HREADY,
|
|
||||||
// I/O Interface
|
|
||||||
input TIMECLK,
|
|
||||||
input [3:0] GPIOPinsIn_IO,
|
|
||||||
output [4:0] GPIOPinsOut_IO,
|
|
||||||
input UARTSin,
|
|
||||||
output UARTSout,
|
|
||||||
input ddr4_calib_complete,
|
|
||||||
input [3:0] SDCDatIn,
|
|
||||||
output SDCCLK,
|
|
||||||
input SDCCmdIn,
|
|
||||||
output SDCCmdOut,
|
|
||||||
output SDCCmdOE
|
|
||||||
);
|
|
||||||
|
|
||||||
wire [31:0] GPIOPinsIn;
|
|
||||||
wire [31:0] GPIOPinsOut;
|
|
||||||
|
|
||||||
assign GPIOPinsOut_IO = GPIOPinsOut[4:0];
|
|
||||||
assign GPIOPinsIn = {28'b0, GPIOPinsIn_IO};
|
|
||||||
|
|
||||||
// wrapper for fpga
|
|
||||||
wallypipelinedsoc wallypipelinedsoc(.*);
|
|
||||||
endmodule
|
|
Loading…
Reference in New Issue
Block a user