Skip to content

Commit 0ca723d

Browse files
authored
Merge pull request #1423 from slaclab/pre-release
Release Candidate v2.72.0
2 parents fb43625 + 452f253 commit 0ca723d

213 files changed

Lines changed: 7528 additions & 410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# GitHub requests reviews from CODEOWNERS when matching files change.
2+
# If path-specific rules are added later, include one of these owners on each
3+
# rule to keep code-owner review required for every PR into pre-release.
4+
5+
* @bengineerd @slacrherbst @ruck314

AGENTS.md

Lines changed: 240 additions & 0 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@ SLAC Ultimate RTL Framework
66

77
<!--- ########################################################################################### -->
88

9+
# Repository Map
10+
11+
- [Agent guidance](AGENTS.md): project layout, coding conventions, and verification notes for contributors and coding agents.
12+
- [AXI](axi/README.md): AXI-Lite, AXI4, AXI Stream, DMA, bridges, and simulation-link RTL.
13+
- [Base](base/README.md): foundational packages, CDC, FIFO, RAM, reset, delay, CRC, and generic RTL helpers.
14+
- [Devices](devices/README.md): vendor and component-specific RTL support.
15+
- [DSP](dsp/README.md): generic and Xilinx-specific DSP support.
16+
- [Ethernet](ethernet/README.md): MAC, raw Ethernet, IPv4, UDP, RoCEv2, and high-speed Ethernet cores.
17+
- [Protocols](protocols/README.md): PGP, SSI, SRP, RSSI, CoaXPress, JESD204B, peripheral buses, and related protocol cores.
18+
- [Xilinx](xilinx/README.md): Xilinx-family wrappers, primitive integrations, and XVC UDP support.
19+
- [Python](python/README.md): PyRogue package layout under `python/surf`.
20+
- [Tests](tests/README.md): cocotb regression layout, methodology, helpers, and simulator conventions.
21+
22+
<!--- ########################################################################################### -->
23+
924
# Before you clone the GIT repository
1025

1126
Setup for large filesystems on github. `git-lfs` used for all binary files (example: .dcp)

axi/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# AXI
2+
3+
This tree contains reusable AXI-family RTL and wrappers. Top-level `axi/ruckus.tcl` loads the submodules used by SURF builds.
4+
5+
## Layout
6+
7+
- `axi-lite/`: AXI-Lite records, crossbars, endpoints, masters, slaves, monitors, and IP-integrator adapters.
8+
- `axi-stream/`: AXI Stream records, FIFOs, muxes, monitors, protocol adapters, and stream wrappers.
9+
- `axi4/`: full AXI4 support blocks and adapters.
10+
- `bridge/`: bridges between AXI-family buses and SURF protocol records.
11+
- `dma/`: DMA register, descriptor, FIFO, and stream integration cores.
12+
- `simlink/`: simulator-link support and C/C++/VHDL pieces used by simulation flows.
13+
14+
Use existing package record types before adding flattened ports. Put durable adapter entities in `ip_integrator/` or `wrappers/`, and keep executable cocotb tests under `tests/axi/`.

axi/axi-lite/rtl/AxiLitePkg.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ package AxiLitePkg is
262262
connectivity => X"FFFF"));
263263

264264
-------------------------------------------------------------------------------------------------
265-
-- Initilize masters with uppder address bits already set to configuration base address
265+
-- Initialize masters with upper address bits already set to configuration base address
266266
-------------------------------------------------------------------------------------------------
267267
function axiWriteMasterInit (constant config : AxiLiteCrossbarMasterConfigArray) return AxiLiteWriteMasterArray;
268268
function axiWriteMasterInit (constant config : AxiLiteCrossbarMasterConfigType) return AxiLiteWriteMasterType;

axi/axi-lite/rtl/AxiLiteSequencerRam.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ begin
451451
end if;
452452
----------------------------------------------------------------------
453453
when SEQ_DONE_S =>
454-
-- Set all bits to 1 so SW knowns it done
454+
-- Set all bits to 1 so SW knows it done
455455
v.addr := (others => '0');
456456
v.din := (others => '1');
457457
v.wstrb := (others => '1');

axi/axi-stream/ip_integrator/AxiStreamFifoV2IpIntegrator.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ entity AxiStreamFifoV2IpIntegrator is
6666

6767
-- Internal FIFO width select, "WIDE", "NARROW" or "CUSTOM"
6868
-- WIDE uses wider of slave / master. NARROW uses narrower.
69-
-- CUSOTM uses passed FIFO_DATA_WIDTH_G
69+
-- CUSTOM uses passed FIFO_DATA_WIDTH_G
7070
INT_WIDTH_SELECT : string := "WIDE";
7171
INT_DATA_WIDTH : natural range 1 to 16 := 16;
7272

axi/axi-stream/rtl/AxiStreamBatchingFifo.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ begin
216216
------- END MAIN DATA FIFO -------
217217
----------------------------------
218218

219-
-- These signals are not responsible for hanshakes and can
219+
-- These signals are not responsible for handshakes and can
220220
-- just be forwarded
221221
combAxisMaster.tData <= axisMasterFifo.tData;
222222
combAxisMaster.tStrb <= axisMasterFifo.tStrb;

axi/axi-stream/rtl/AxiStreamCompact.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ begin -- architecture rtl
142142
-- Reset full flags
143143
v.fullBus := false;
144144

145-
-- get tKeet boundaries
145+
-- get tKeep boundaries
146146
tKeepMin := getTKeepMin(sAxisMaster.tKeep, SLAVE_AXI_CONFIG_G);
147147
tKeepWidth := getTKeep(sAxisMaster.tKeep, SLAVE_AXI_CONFIG_G);
148148
tDataWidth := to_integer(shift_left(to_unsigned(tKeepWidth, SLV_BYTES_C), 3));

axi/axi-stream/rtl/AxiStreamConcat.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
-- Description: Firmware module that AxiStreamConcat multiple AXI stream frames
55
-- together. It will ignore TKEEP and the format of the frame.
66
-------------------------------------------------------------------------------
7-
-- Note: This module is similiar to "AxiStreamBatcher.vhd" but does NOT
7+
-- Note: This module is similar to "AxiStreamBatcher.vhd" but does NOT
88
-- have the following features
99
-- 1) No super header
1010
-- 2) No tail footer

0 commit comments

Comments
 (0)