Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs in boot and new flash card merge. Works with arty a7 now.

Browse Source
This commit is contained in:
Ross Thompson 2023-07-22 15:33:33 -05:00
parent 608400ac6a
commit 6099b0e763
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/fpga/config.vh
View File

@ -107,7 +107,7 @@ localparam logic [63:0] BOOTROM_BASE = 64'h00001000;
localparam logic [63:0] BOOTROM_RANGE = 64'h00000FFF; localparam logic [63:0] BOOTROM_RANGE = 64'h00000FFF;
localparam UNCORE_RAM_SUPPORTED = 1'b1; localparam UNCORE_RAM_SUPPORTED = 1'b1;
localparam logic [63:0] UNCORE_RAM_BASE = 64'h80002000; localparam logic [63:0] UNCORE_RAM_BASE = 64'h00002000;
localparam logic [63:0] UNCORE_RAM_RANGE = 64'h00000FFF; localparam logic [63:0] UNCORE_RAM_RANGE = 64'h00000FFF;
localparam EXT_MEM_SUPPORTED = 1'b1; localparam EXT_MEM_SUPPORTED = 1'b1;

10
fpga/src/fpgaTopArtyA7.v
View File

@ -135,7 +135,7 @@ module fpgaTop
wire [2:0] BUS_axi_awsize; wire [2:0] BUS_axi_awsize;
wire [1:0] BUS_axi_awburst; wire [1:0] BUS_axi_awburst;
wire [3:0] BUS_axi_awcache; wire [3:0] BUS_axi_awcache;
wire [30:0] BUS_axi_awaddr; wire [31:0] BUS_axi_awaddr;
wire [2:0] BUS_axi_awprot; wire [2:0] BUS_axi_awprot;
wire BUS_axi_awvalid; wire BUS_axi_awvalid;
wire BUS_axi_awready; wire BUS_axi_awready;
@ -156,7 +156,7 @@ module fpgaTop
wire [2:0] BUS_axi_arprot; wire [2:0] BUS_axi_arprot;
wire [3:0] BUS_axi_arcache; wire [3:0] BUS_axi_arcache;
wire BUS_axi_arvalid; wire BUS_axi_arvalid;
wire [30:0] BUS_axi_araddr; wire [31:0] BUS_axi_araddr;
wire BUS_axi_arlock; wire BUS_axi_arlock;
wire BUS_axi_arready; wire BUS_axi_arready;
wire [3:0] BUS_axi_rid; wire [3:0] BUS_axi_rid;
@ -167,6 +167,7 @@ module fpgaTop
wire BUS_axi_rready; wire BUS_axi_rready;
wire BUSCLK; wire BUSCLK;
wire sdio_reset_open;
// Crossbar to Bus ------------------------------------------------ // Crossbar to Bus ------------------------------------------------
@ -192,6 +193,7 @@ module fpgaTop
(* mark_debug = "true" *)wire [1:0]s00_axi_bresp; (* mark_debug = "true" *)wire [1:0]s00_axi_bresp;
(* mark_debug = "true" *)wire s00_axi_bvalid; (* mark_debug = "true" *)wire s00_axi_bvalid;
(* mark_debug = "true" *)wire s00_axi_bready; (* mark_debug = "true" *)wire s00_axi_bready;
wire [3:0] s00_axi_arid;
(* mark_debug = "true" *)wire [31:0]s00_axi_araddr; (* mark_debug = "true" *)wire [31:0]s00_axi_araddr;
(* mark_debug = "true" *)wire [7:0]s00_axi_arlen; (* mark_debug = "true" *)wire [7:0]s00_axi_arlen;
(* mark_debug = "true" *)wire [2:0]s00_axi_arsize; (* mark_debug = "true" *)wire [2:0]s00_axi_arsize;
@ -237,6 +239,7 @@ module fpgaTop
wire s01_axi_bready; wire s01_axi_bready;
wire [31:0]s01_axi_araddr; wire [31:0]s01_axi_araddr;
wire [7:0]s01_axi_arlen; wire [7:0]s01_axi_arlen;
wire [3:0] s01_axi_arid;
wire [2:0]s01_axi_arsize; wire [2:0]s01_axi_arsize;
wire [1:0]s01_axi_arburst; wire [1:0]s01_axi_arburst;
wire [0:0]s01_axi_arlock; wire [0:0]s01_axi_arlock;
@ -525,7 +528,7 @@ module fpgaTop
xlnx_ahblite_axi_bridge xlnx_ahblite_axi_bridge_0 xlnx_ahblite_axi_bridge xlnx_ahblite_axi_bridge_0
(.s_ahb_hclk(CPUCLK), (.s_ahb_hclk(CPUCLK),
.s_ahb_hresetn(peripheral_aresetn), .s_ahb_hresetn(peripheral_aresetn),
.s_ahb_hsel(HSELEXT), .s_ahb_hsel(HSELEXT | HSELEXTSDC),
.s_ahb_haddr(HADDR[31:0]), .s_ahb_haddr(HADDR[31:0]),
.s_ahb_hprot(HPROT), .s_ahb_hprot(HPROT),
.s_ahb_htrans(HTRANS), .s_ahb_htrans(HTRANS),
@ -833,6 +836,7 @@ module fpgaTop
.s_axi_rresp(SDCin_axi_rresp), .s_axi_rresp(SDCin_axi_rresp),
.s_axi_rvalid(SDCin_axi_rvalid), .s_axi_rvalid(SDCin_axi_rvalid),
.s_axi_rready(SDCin_axi_rready), .s_axi_rready(SDCin_axi_rready),
.sdio_reset(sdio_reset_open),
// Master Interface // Master Interface
.m_axi_awaddr(SDCout_axi_awaddr), .m_axi_awaddr(SDCout_axi_awaddr),

5
src/uncore/uncore.sv
View File

@ -146,6 +146,11 @@ module uncore import cvw::*; #(parameter cvw_t P)(
assign UARTSout = 0; assign UARTIntr = 0; assign UARTSout = 0; assign UARTIntr = 0;
end end
// eventually remove
assign HREADSDC = '0;
assign HREADYSDC = '1;
assign HRESPSDC = '0;
// AHB Read Multiplexer // AHB Read Multiplexer
assign HRDATA = ({P.XLEN{HSELRamD}} & HREADRam) | assign HRDATA = ({P.XLEN{HSELRamD}} & HREADRam) |
({P.XLEN{HSELEXTD | HSELEXTSDCD}} & HRDATAEXT) | ({P.XLEN{HSELEXTD | HSELEXTSDCD}} & HRDATAEXT) |