Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1211 commits
Select commit Hold shift + click to select a range
d5770c6
BLM: changes to the counter pool
ruantea Jun 8, 2022
c9803c4
BLM: added new counters
ruantea Jun 13, 2022
f3d4303
BLM: version with 48 up_down counters
ruantea Jun 14, 2022
ee90d29
BLM: added new modules
ruantea Jun 21, 2022
16dd1eb
DIOB BLM: increased counters number - output part partially realized
ruantea Jul 19, 2022
6a581e4
DIOB BLM: added a new module for better readability of the top level
ruantea Jul 26, 2022
dc565c7
DIOB BLM: further optimization of the top level by adding an addition…
ruantea Jul 27, 2022
7c52450
DIOB BLM: new version
ruantea Sep 20, 2022
f222a12
DIOB BLM: reduced the number of registers
ruantea Sep 20, 2022
eae5cbb
DIOB BLM: changes in BLM Constraints Register
ruantea Sep 21, 2022
b0bae88
DIOB BLM: corrections in the counter unit
ruantea Sep 21, 2022
946854d
DIOB BLM: added more status registers; added overflow control also fo…
ruantea Sep 29, 2022
1c4649a
BLM_DIOB: bug fixes in counter unit and in out section
ruantea Oct 4, 2022
96b3674
BLM_DIOB: gate-timing and watchdog optimization
ruantea Oct 6, 2022
6044f3b
DIOB_BLM: little changes and adjustments
ruantea Oct 11, 2022
b13d8ab
DIOB_BLM: Status Registers upddate
ruantea Oct 11, 2022
b7398d3
DIOB_BLM: added an enable for the outputs of the BLM and updated a ch…
ruantea Oct 13, 2022
2a53849
DIOB_BLM: increased daq channels
ruantea Oct 18, 2022
94e47cd
DIOB_BLM: changes in the daq_dat channels
ruantea Oct 20, 2022
517640a
DIOB_BLM: updated watchdog and gate timing state machines
ruantea Oct 20, 2022
d65f62e
DIOB_BLM: new changes
ruantea Nov 2, 2022
088ae17
DIOB_BLM: changes in the output section
ruantea Nov 4, 2022
c878ea6
BLM_DIOB: changes in the output section and in the status registers
ruantea Nov 7, 2022
5ff59e6
DIOB_BLN: corrected an error in the output section
ruantea Nov 8, 2022
fb1887b
DIOB_BLM: changes in BLM_counter_pool.vhd module
ruantea Nov 10, 2022
6ae1f84
DIOB_BLM: further changes in BLM_counter_pool.vhd file
ruantea Nov 10, 2022
902c18f
DIOB BLM: new version, with 256 up_down counters
ruantea Nov 17, 2022
6faeee8
DIOB BLM: reorganization of BLM Registers
ruantea Nov 30, 2022
fde9502
DIOB BLM: fixed BLM_status_reg(7) bit assignment
ruantea Nov 30, 2022
6dbd58b
DIOB BLM: minor changes
ruantea Dec 1, 2022
da71d15
DIOB BLM: little changes
ruantea Dec 6, 2022
3463d59
DIOB BLM: reduction of the overflow memory size in the output section
ruantea Dec 6, 2022
f7747e3
Merge pull request #317 from GSI-CS-CO/DIOB_Beam_Loss_Mon_repair
alyxazon Feb 8, 2023
5eb464d
common_scheduleCompare.py: implement multithreading.
Feb 8, 2023
dcb224d
replaceChain, scheduleCompare: add option -V for version.
Feb 8, 2023
de5bbb0
yocto: add important build information
alyxazon Feb 8, 2023
85277a6
fbas: fix to ignored 'disable MPS operation' instruction
ebold-cscotos Feb 8, 2023
2906d5c
fbas: re-factor to get less output message
ebold-cscotos Feb 8, 2023
96582e5
Improve usage message of replaceChain and scheduleCompare.
Feb 9, 2023
71860e6
Add EBPATH1 in rpath (linker) for Jenkins build on builder.acc.gsi.de.
Feb 9, 2023
a2195f5
Merge branch 'fallout' into fallout_fbas_wrs_test
ebold-cscotos Feb 9, 2023
3633cb5
Merge pull request #318 from GSI-CS-CO/fallout_fbas_wrs_test
alyxazon Feb 9, 2023
9bad87d
Implement option -w to allow overwrite of output file.
Feb 9, 2023
20ea15a
test_replaceChain.py: add tests for replaceChain -V and replaceChain -h.
Feb 9, 2023
f9fb440
test_replaceChain.py: Implement test_replaceChainLoop.
Feb 9, 2023
3e73bd1
replaceChain.cpp: explain return 1 in usage message.
Feb 9, 2023
346e740
dm-unipz: first deployment to a yocto ramdisk .
dietrichb Feb 9, 2023
a1c0030
dm-unipz: 2nd deployment to a yocto ramdisk
dietrichb Feb 9, 2023
5212da8
dm-unipz: fixing a bug in the startup script for INT
dietrichb Feb 9, 2023
aad16e5
dm-unipz: 2nd deployment to a yocto ramdisk .
dietrichb Feb 10, 2023
fb5733f
dm-unipz: 2nd deployment to a yocto ramdisk ..
dietrichb Feb 10, 2023
7e8d1e4
b2b: clean up
dietrichb Feb 10, 2023
49a79e8
b2b: cleanup Makefiles and some nfsinit scripts
dietrichb Feb 10, 2023
fe21c5b
b2b: cleanup Makefiles and some nfsinit scripts .
dietrichb Feb 10, 2023
3481a27
b2b: 2nd deployment to a yocto ramdisk .
dietrichb Feb 10, 2023
f909630
network-diag: created
dietrichb Feb 10, 2023
2dbc616
Makefile: target install: use INSTALLPATH = $HOME/.local/bin if not r…
Feb 14, 2023
55cd0e7
b2b: 2nd deployment to a yocto ramdisk ..
dietrichb Feb 14, 2023
b9405e2
b2b: 2nd deployment to a yocto ramdisk ...
dietrichb Feb 14, 2023
c1e2e7a
doc/ReplaceChainByVertex: add example tsl020-sis100.
Feb 14, 2023
f80ff87
Implement pipe (output to stdout if no output file name is given.
Feb 14, 2023
2a739fb
b2b: 2nd deployment to a yocto ramdisk ....
dietrichb Feb 14, 2023
ab39ade
Merge remote-tracking branch 'origin/b2byocto-dietrich-2023-feb-03' i…
dietrichb Feb 15, 2023
f96a135
b2b: cbu, changing to TEF field for some data
dietrichb Feb 15, 2023
39bf9e6
common-lib: implementing code for readout of ECA channel via EB
dietrichb Feb 15, 2023
e5b0cbc
Makefile: allow installation into $HOME/.local if not running with sudo.
Feb 16, 2023
c9d2b86
DIOB: new version of the DIOB top level
ruantea Feb 16, 2023
47dade0
Merge pull request #319 from GSI-CS-CO/feature_DIOB
ruantea Feb 16, 2023
32d598b
replaceChainImpl.cpp: fix handling of names and labels when last vert…
Feb 16, 2023
d9c862e
test_replaceChain.py: add test cases for last vertex in chain which h…
Feb 16, 2023
105f1b3
Add more examples / test cases for documentation.
Feb 16, 2023
564154c
b2b: raw-server, changed to readout of ECA channel via EB
dietrichb Feb 16, 2023
aad128e
b2b: raw-server can handle TEF fields
dietrichb Feb 16, 2023
d056f23
common-lib: added 'core' routines common to x86 and lm32
dietrichb Feb 17, 2023
482391c
common-lib: added routines for conversion to/from 16 bit floating point
dietrichb Feb 17, 2023
6df1dee
b2b: changed format for set-values in TEF from fixed point to 16bit f…
dietrichb Feb 17, 2023
650aabf
b2b: implemented changes for (TEF) with half precision numbers
dietrichb Feb 20, 2023
e29d88b
b2b: serv-raw, minor debugging
dietrichb Feb 21, 2023
c582441
Makefile: Add EBPATH1 for Jenkins build on builder.acc.gsi.de.
Feb 21, 2023
f59a3ec
common-lib: corrected routine description
dietrichb Feb 21, 2023
d23ad3b
b2b: added one diagnostic element to raw data type
dietrichb Feb 21, 2023
22e5089
b2b: offset of deadline of phase result extraction added to TEF field…
dietrichb Feb 21, 2023
60626f1
ReplaceChain-presentation.odp: presentation about replaceChain.
Feb 22, 2023
e91dd15
fbas: updated README.md
ebold-cscotos Feb 22, 2023
6075960
burstgen: added a demo script that runs 2 kinds of burst
ebold-cscotos Feb 22, 2023
dd58129
ReplaceChain-presentation.odp: correct PDF output.
Feb 22, 2023
9042aa4
replaceChain: implement read from stdin, handle -Txdot
Feb 22, 2023
2b60cc3
b2b: sync
dietrichb Feb 22, 2023
b1be18a
Merge pull request #321 from GSI-CS-CO/fallout_bg_test
ebold-cscotos Feb 23, 2023
22a7ec6
Replace dm-cmd and dm-sched by self.binaryDmCmd and self.binrayDmSche…
Feb 23, 2023
a440e88
common-lib: slightly improved conversion routines for half precision …
dietrichb Feb 23, 2023
d7c7b95
common-lib: slightly improved conversion routines for half precision …
dietrichb Feb 23, 2023
4fd1845
b2b: offset of deadline of phase result extraction added to TEF field…
dietrichb Feb 23, 2023
8d8c1be
common-lib: cleaning up code
dietrichb Feb 24, 2023
43a8dfc
b2b: some debugging
dietrichb Feb 24, 2023
27a14b5
b2b: move int-sis18 (still on on sl7) to new deployment
dietrichb Feb 28, 2023
c4137d9
b2b: move int-esr (still on on sl7) to new deployment
dietrichb Feb 28, 2023
bc679cf
b2b: move int-yr (still on on sl7) to new deployment
dietrichb Feb 28, 2023
2a5a655
b2b: makefiles more hackish to support SL7, R9 and Yocto :-|
dietrichb Feb 28, 2023
cb146de
b2b: archiver, fix header string
dietrichb Mar 1, 2023
43de6a6
add a test for replaceChain with two connected cycles.
Mar 1, 2023
1378fec
fbas: added Makefile to deploy the FBAS artifacts into a given timing…
ebold-cscotos Feb 27, 2023
a9e724d
fbas: added NFS scripts (RTE symlink, NFS init)
ebold-cscotos Mar 1, 2023
7416302
b2b: cbu, debug info
dietrichb Mar 1, 2023
379a4a1
b2b: daq + archiver, debugging and additional information
dietrichb Mar 1, 2023
df23580
fbas: check timing RTE deployment for FBAS
ebold-cscotos Mar 1, 2023
a3c26b3
fbas: updated the location of the setup script
ebold-cscotos Mar 2, 2023
f1258ca
fbas: removed the deployment script (which is not needed anymore)
ebold-cscotos Mar 2, 2023
1f1982c
fbas: re-organization of the RTE stuff
ebold-cscotos Mar 2, 2023
556189e
fbas: common fwlib requires a new 'tef' argument
ebold-cscotos Mar 2, 2023
2795e3c
b2b: lots of debugging, more diagnostics in archived data
dietrichb Mar 2, 2023
6d5f72c
fbas: build 2 versions of firmware (1/16 MPS channels)
ebold-cscotos Mar 2, 2023
b87e04a
Merge pull request #322 from GSI-CS-CO/fallout_fbas_deploy
alyxazon Mar 3, 2023
86b74fd
b2b: serv-raw configured to rt policy round-robin, prio 1
dietrichb Mar 3, 2023
1808065
b2b: set version number to 00.04.24
dietrichb Mar 3, 2023
0be8562
b2b: back to legacy time routine as gcc is too old :-(
dietrichb Mar 3, 2023
36c8a6a
b2b: serv-raw performance measurement session on yocto
dietrichb Mar 6, 2023
ae140bc
Tools: remove YOCTO flag from Makefile, use cc and cxx as default
alyxazon Mar 6, 2023
0e87f5b
ReplaceChain-presentation.odp: add link to wiki page.
Mar 7, 2023
97f2f9b
Makefile: rewrite target all: automatically run all pytest tests.
Mar 7, 2023
948e85f
CommandsHistory.py: remove reason for warning deprecated escape seque…
Mar 7, 2023
915de9f
fbas: extend the timing RTE deployment (for Yocto based ramdisk)
ebold-cscotos Mar 7, 2023
2961d18
replaceChainImpl.cpp: implement option -b - separate blocks (all vert…
Mar 8, 2023
68a6d7b
option -b - separate blocks: add tests for this.
Mar 8, 2023
cf61f05
option -b - separate blocks: correction.
Mar 9, 2023
3e9d78d
option -b - separate blocks: add more tests for this.
Mar 9, 2023
d1612fb
option -b - separate blocks: add more tests for this.
Mar 9, 2023
6559db8
Makefile: let CARPEDM_PATH be the first part of LD_LIBRARY_PATH to en…
Mar 9, 2023
e09b92d
Makefile: let CARPEDM_PATH be the first part of LD_LIBRARY_PATH to en…
Mar 9, 2023
e937cc4
dm_testbench.py: correction, uncomment dm-sched add to start all patt…
Mar 9, 2023
d12ca13
replace <boost/bind.hpp> with <boost/bind/bind.hpp> in header files t…
Mar 9, 2023
192ecf9
fbas: fix wrong name of binaries
ebold-cscotos Mar 10, 2023
c55ed99
eb-i2c-master: typo
alyxazon Mar 10, 2023
e0fc4d1
add testcases for chain with 5 vertices, different types, but ignore …
Mar 14, 2023
c639d59
etherbone-core: update
alyxazon Mar 14, 2023
07c9b73
build_id.tcl: remove lsb_release usage
alyxazon Mar 14, 2023
ae60f9c
README.md: update
alyxazon Mar 14, 2023
920c7f3
b2b: cbu, cPhase from ns -> ps
dietrichb Mar 14, 2023
93755d7
Remove replaceChainXdot.py. See wiki how to pipe replaceChain output …
Mar 15, 2023
edd57e7
Repair segmentation fault. Add checks to ULONG_MAX for successor or p…
Mar 15, 2023
b591c9d
Version 1.0.1; remove unused option -T.
Mar 16, 2023
955b663
b2b: fixes ...
dietrichb Mar 16, 2023
110bb49
eb-asmi: update WB_ASMI_ID
alyxazon Mar 16, 2023
b97193b
b2b: CBU 'inherits' param field from LSA (trigger messages)
dietrichb Mar 20, 2023
0fa0e2c
etherbone-core: v2.1.3
alyxazon Mar 21, 2023
0f8225c
Merge branch 'b2b_dietrich_2023-jan-30' of https://github.com/GSI-CS-…
dietrichb Mar 21, 2023
f4670a6
tools: modified Makefile for yocto
dietrichb Mar 21, 2023
b7f2c8a
b2b: fixes, change a FEC to yocto
dietrichb Mar 21, 2023
b4cad03
fbas: re-name the MPS protocol reception timestamp
ebold-cscotos Mar 10, 2023
d4f68d4
burstgen: clear all task variables on removal of a burst
ebold-cscotos Mar 22, 2023
2454b43
burstgen: print out all task variables (host 'show' command)
ebold-cscotos Mar 22, 2023
ac498c8
burstgen: extended the diagnostic output with the ECA action counters
ebold-cscotos Mar 22, 2023
a337a96
burstgen: add scripts to create the NFSinit symlinks
ebold-cscotos Mar 22, 2023
bdefcc4
frequency measure: rename
dietrichb Mar 22, 2023
47ba2a6
frequency measure: ported makefiles to yocto SDK
dietrichb Mar 22, 2023
7d31f5c
replaceChainImpl.cpp: show the length of the chain - 2 near the three…
Mar 22, 2023
faab597
frequency measure: ported deployment to yocto SDK
dietrichb Mar 22, 2023
c386b98
show the length of the chain - 2 near the three dots: adopt test cases.
Mar 22, 2023
d50b4e6
burstgen: add a demo script (with 2 bursts) for SCU
ebold-cscotos Mar 22, 2023
68edd36
fbas: evaluate the life-time of the MPS protocol
ebold-cscotos Mar 22, 2023
3a461be
b2b: fixing minor issues
dietrichb Mar 22, 2023
c5d2b9a
b2b: fixing minor issues .
dietrichb Mar 22, 2023
6433a1a
b2b: fixing order of building 'all' targets - libb2b should be built …
dietrichb Mar 23, 2023
877bf2a
b2b: added parameters for firmware (LSA evtID and param for injection)
dietrichb Mar 23, 2023
6c76ef9
fbas: list required files with their checksums before the test
ebold-cscotos Mar 23, 2023
f363183
fbas: initiate the node registration
ebold-cscotos Mar 23, 2023
894ebbd
fbas: broadcast the node registration request
ebold-cscotos Mar 24, 2023
382208a
fbas: change the node registration (TX nodes send the registration re…
ebold-cscotos Mar 28, 2023
b80833b
fbas: complete the node registration
ebold-cscotos Mar 30, 2023
626d763
fbas: support of multiple TX nodes in the network performance test
ebold-cscotos Apr 3, 2023
4f86b24
fbas: complete the support of multiple TX nodes in the nw.perf test
ebold-cscotos Apr 4, 2023
440a136
lm32-toolchain: v1.1-2023-04-04
alyxazon Apr 5, 2023
a7f1ad4
Makefile: fix bg target
alyxazon Apr 5, 2023
6358005
new replaceChain test case from Andreas Schaller for option -b.
Apr 5, 2023
ea1411e
new replaceChain test case for option -b (minimal).
Apr 5, 2023
ccb24f6
prepareRemoteSnoop.sh: add script to copy ssh public key for this use…
Apr 5, 2023
bdd03f9
fel0069_known_host: add known_host key to enable ssh connections to f…
Apr 5, 2023
1dc730d
prepareRemoteSnoop.sh: add commands to display authorized_keys and kn…
Apr 5, 2023
5a7b6ec
Merge remote-tracking branch 'origin/fallout' into dm-fallout-tests-2
Apr 11, 2023
44a6cc0
README.md: update
alyxazon Apr 11, 2023
a101bd5
DM: pexaria5 ftm Makefile - remove tool build
mkreider Apr 12, 2023
5f6dac0
Merge remote-tracking branch 'origin/dm-fallout-tests-2' into dm-summ…
Apr 12, 2023
d8e69bd
Merge remote-tracking branch 'origin/dm-summer-update-2022' into fallout
alyxazon Apr 13, 2023
a262675
wr-cores: correct submodule pointer
alyxazon Apr 13, 2023
d55ee6e
wrpc-sw: correct submodule pointer, merge pull request #324
alyxazon Apr 13, 2023
d05d71c
ftm: change seed
alyxazon Apr 13, 2023
c034ddf
ftdi-mcp: first commit
dietrichb Apr 18, 2023
3320c77
ftdi-mcp: first version
dietrichb Apr 18, 2023
e4b5791
ftdi-mcp: cleaning up makefile
dietrichb Apr 19, 2023
76c73da
ftdi-mcp: bug fixes
dietrichb Apr 19, 2023
ea2ffb4
fbas: accept unknown SSH host keys
ebold-cscotos Apr 18, 2023
3fc0fbc
ftdi-mcp: added readme
dietrichb Apr 19, 2023
c5e862e
Merge branch 'dietrich_ftdi_2023-apr-18' of https://github.com/GSI-CS…
dietrichb Apr 19, 2023
eeb9813
fbas: fixed latency measurement failure
ebold-cscotos Apr 19, 2023
bf26de5
fbas: added diagnostic command 0x36
ebold-cscotos Apr 20, 2023
78348b6
fbas: bugfix in mapping of MPS message buffer to IO port (buf[i]->por…
ebold-cscotos Apr 20, 2023
1e532dd
fbas: provide 'offset' explicitly to drive the output port
ebold-cscotos Apr 20, 2023
47a8ee3
fbas: removed the 'new cycle' injection
ebold-cscotos Apr 20, 2023
d13fe0f
fbas: added new script to deploy temporary artifacts for testing
ebold-cscotos Apr 21, 2023
06f8136
readme done
dietrichb Apr 21, 2023
7c1ad31
Merge branch 'fallout' into fallout_fbas
ebold-cscotos Apr 21, 2023
3eefb44
fbas: fixed filename globbing
ebold-cscotos Apr 21, 2023
7444442
ftdi-mcp: readme updated
dietrichb Apr 21, 2023
927bd2d
burstgen: added a missing manifest file
ebold-cscotos Apr 24, 2023
eaf5ae8
burstgen: wipe the test script
ebold-cscotos Apr 25, 2023
1b3d1b4
burstgen: format the command output
ebold-cscotos Apr 25, 2023
6e156a8
README.md: add pkgconfig/pkg-config hint
alyxazon Apr 26, 2023
58dd74a
saftlib submodule pointer update and wr-mil-gw port to saftlib3
Apr 26, 2023
38d4896
README.md: update
alyxazon Apr 26, 2023
e336f4a
README.md: update
alyxazon Apr 26, 2023
26c3b67
bg: change eca_flags.h path (saftlib 3.0.0)
alyxazon Apr 5, 2023
105609d
bug fixes: scu2/3 housekeeping and common-fwlib -> eca_flags.h path
alyxazon Apr 5, 2023
ea47bdc
Merge branch 'fallout' into b2b_dietrich_2023-jan-30
alyxazon Apr 27, 2023
fc1328e
Merge pull request #327 from GSI-CS-CO/dietrich_ftdi_2023-apr-18
alyxazon Apr 27, 2023
cb48356
Merge pull request #326 from GSI-CS-CO/b2b_dietrich_2023-jan-30
alyxazon Apr 27, 2023
1b19e6f
burstgen: extend demo script for supporting saftlib v3
ebold-cscotos Apr 28, 2023
e04891a
burstgen: remove existing IO conditions before setting up each test
ebold-cscotos May 3, 2023
4016566
burstgen: re-factored the task scheduler period measurement
ebold-cscotos May 5, 2023
0b0d1a0
burstgen: provide the common buffer addresses for host communication
ebold-cscotos May 10, 2023
58e39f2
burstgen: added scripts that are used to work with saftlib v3
ebold-cscotos May 11, 2023
f248cce
Merge pull request #328 from GSI-CS-CO/fallout_bg
ebold-cscotos May 12, 2023
55d9aef
pexarria10: change pinning
alyxazon Jun 20, 2023
0a66afe
ftm10: change pinning
alyxazon Jun 21, 2023
d4df75b
eb-mon: get state of IP address; experimental code
dietrichb Jun 21, 2023
69183ee
eb-mon: fixes
dietrichb Jun 22, 2023
79aee17
eb-mon: fixes ..
dietrichb Jun 22, 2023
d847a1a
Merge pull request #329 from GSI-CS-CO/ebmon_dietrich_2023-jun-21
alyxazon Jun 27, 2023
cb8596a
Merge pull request #331 from GSI-CS-CO/diob-atr-dis
alyxazon Jul 5, 2023
2865a87
simple-display: add new target to install the built executable file
ebold-cscotos Jul 24, 2023
ca0ff90
Merge pull request #333 from GSI-CS-CO/install-simple-display
alyxazon Jul 24, 2023
21a5466
saftlib: v3.0.2
alyxazon Aug 2, 2023
5cefaaf
Update README.md
alyxazon Aug 2, 2023
df4ab72
Update README.md
alyxazon Aug 2, 2023
0346f3a
scu4: fix wrong sfp clock
alyxazon Aug 9, 2023
6c3fa54
ftm4: fix wrong sfp clock
alyxazon Aug 9, 2023
4f8ce18
ftm4dp: fix wrong sfp clock
alyxazon Aug 9, 2023
dcdbf2a
testbench: add a lm32 cluster testbench
Aug 16, 2023
51fa7e3
Merge pull request #335 from GSI-CS-CO/lm32_cluster_testbench
miree Aug 16, 2023
0eed67e
Update REAME.md
miree Aug 16, 2023
b2b0dfc
arria10/sys_fpll10: quartus update
alyxazon Aug 17, 2023
453d5b7
arria10/sys_pll10: quartus update
alyxazon Aug 17, 2023
04c0192
arria10_e3p1/sys_pll10: update
alyxazon Aug 17, 2023
f3b50a6
arria10_ftm10/sys_pll10: update
alyxazon Aug 17, 2023
22d2000
arria10_ftm4/sys_pll10: update
alyxazon Aug 17, 2023
ab09401
arria10_pex10/sys_pll10: update
alyxazon Aug 17, 2023
2c3ad89
arria10_scu4/sys_pll10: update
alyxazon Aug 17, 2023
e285380
Merge pull request #336 from GSI-CS-CO/fallout_a10_sys_pll_fix
alyxazon Aug 17, 2023
6d118dd
eb-clock: remove IO hack check
alyxazon Aug 24, 2023
e4f18a1
saftlib: v3.0.3
alyxazon Aug 30, 2023
88c7de5
simulation: pci_control testbench
Aug 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
45 changes: 45 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI Basic Build

on:
push:
branches: [ "master", "proposed_master", "github_actions_development" ]
pull_request:
branches: [ "master", "proposed_master", "github_actions_development" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Install missing packages
run: sudo apt-get -y install automake libreadline-dev docbook-utils build-essential libboost-all-dev pkg-config libsigc++-2.0-dev xsltproc

- name: Set PKG_CONFIG_PATH
run: export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig

- name: Create symlinks
run: sudo ln -s /usr/lib/x86_64-linux-gnu/libmpfr.so.6 /usr/lib/x86_64-linux-gnu/libmpfr.so.4

- name: Setup repository
run: make

- name: Build etherbone
run: make etherbone

- name: Install etherbone
run: sudo make etherbone-install

- name: Build tools
run: make tools

- name: Install tools
run: make tools-install

- name: Build saftlib
run: make saftlib -j$(nproc)

- name: Install saftlib
run: sudo make saftlib-install
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,16 @@ syn
*.swp
*.orig
*.qicache
*.html
*.xml
*.rpt
*~
greybox_tmp
*_shared_mmap.h
buildid.c
ram.ld
.hdlmake
lm32-gcc-4.5.3.tar.xz
lm32-toolchain
lm32-gcc.tar.xz
lm32-gcc-4.5.3/
58 changes: 0 additions & 58 deletions .travis.yml

This file was deleted.

94 changes: 70 additions & 24 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ PWD := $(shell pwd)
UNAME := $(shell uname -m)
EXTRA_FLAGS ?=
WISHBONE_SERIAL ?= # Build wishbone-serial? y or leave blank
YOCTO_BUILD ?= no
export EXTRA_FLAGS

# Set variables that are passed down to sub-makes
Expand All @@ -22,7 +23,7 @@ TLU=$(PWD)/ip_cores/wr-cores/modules/wr_tlu
export TLU
ECA=$(PWD)/ip_cores/wr-cores/modules/wr_eca
export ECA
PATH:=$(PWD)/toolchain/bin:$(PATH)
PATH:=$(PWD)/lm32-toolchain/bin:$(PATH)

# This is mainly used to sort QSF files. After sorting it adds and deletes a "GIT marker" which will mark the file as changed.
# Additionally all empty lines will be removed.
Expand All @@ -38,6 +39,8 @@ CHECK_PMC = ./syn/gsi_pmc/control/pci_pmc
CHECK_MICROTCA = ./syn/gsi_microtca/control/microtca_control
CHECK_PEXP = ./syn/gsi_pexp/control/pexp_control
CHECK_SCU4 = ./syn/gsi_scu/control4/scu_control
CHECK_FTM4 = ./syn/gsi_scu/ftm4/ftm4
CHECK_FTM4DP = ./syn/gsi_scu/ftm4dp/ftm4dp
CHECK_A10GX = ./syn/gsi_a10gx_pcie/control/pci_control
CHECK_FTM = ./syn/gsi_pexarria5/ftm/ftm
CHECK_PEXARRIA10 = ./syn/gsi_pexarria10/control/pexarria10
Expand All @@ -54,6 +57,8 @@ PATH_PMC = syn/gsi_pmc/control
PATH_MICROTCA = syn/gsi_microtca/control
PATH_PEXP = syn/gsi_pexp/control
PATH_SCU4 = syn/gsi_scu/control4
PATH_FTM4 = syn/gsi_scu/ftm4
PATH_FTM4DP = syn/gsi_scu/ftm4dp
PATH_A10GX = syn/gsi_a10gx_pcie/control
PATH_FTM = syn/gsi_pexarria5/ftm
PATH_PEXARRIA10 = syn/gsi_pexarria10/control
Expand Down Expand Up @@ -81,21 +86,25 @@ define ldconfig_note
@echo "***************************************************************************"
endef

all: hdlmake_install etherbone tools sdbfs toolchain firmware driver
all: hdlmake_install etherbone tools sdbfs lm32-toolchain firmware

gateware: all pexarria5 exploder5 vetar2a vetar2a-ee-butis scu2 scu3 pmc microtca pexp

install: etherbone-install tools-install driver-install

clean:: etherbone-clean tools-clean tlu-clean sdbfs-clean driver-clean toolchain-clean firmware-clean scu2-clean scu3-clean vetar2a-clean vetar2a-ee-butis-clean exploder5-clean pexarria5-clean sio3-clean ecatools-clean pmc-clean microtca-clean bg-clean
clean:: etherbone-clean tools-clean tlu-clean sdbfs-clean driver-clean lm32-toolchain-clean firmware-clean scu2-clean scu3-clean vetar2a-clean vetar2a-ee-butis-clean exploder5-clean pexarria5-clean sio3-clean ecatools-clean pmc-clean microtca-clean bg-clean

distclean:: clean
git clean -xfd .
for i in etherbone-core fpga-config-space general-cores wr-cores wrpc-sw; do cd ip_cores/$$i; git clean -xfd .; cd ../..; done

etherbone::
test -f ip_cores/etherbone-core/api/Makefile.in || ./ip_cores/etherbone-core/api/autogen.sh
ifeq ($(YOCTO_BUILD),yes)
cd ip_cores/etherbone-core/api; test -f Makefile || ./configure --enable-maintainer-mode --prefix=$(PREFIX) --host=x86_64
else
cd ip_cores/etherbone-core/api; test -f Makefile || ./configure --enable-maintainer-mode --prefix=$(PREFIX)
endif
$(MAKE) -C ip_cores/etherbone-core/api all

etherbone-clean::
Expand All @@ -106,12 +115,12 @@ etherbone-install::
$(call ldconfig_note)

saftlib::
test -f ip_cores/saftlib/Makefile.in || ./ip_cores/saftlib/autogen.sh
cd ip_cores/saftlib; test -f Makefile || ./configure --enable-maintainer-mode --prefix=$(PREFIX) --sysconfdir=$(SYSCONFDIR)
$(MAKE) -C ip_cores/saftlib all
cd ip_cores/saftlib; test -f Makefile.in || ./autogen.sh
cd ip_cores/saftlib; ./configure $(CONFIGURE_FLAGS) --prefix=$(PREFIX) --sysconfdir=$(SYSCONFDIR)
$(MAKE) -C ip_cores/saftlib

saftlib-clean::
! test -f ip_cores/saftlib/Makefile || $(MAKE) -C ip_cores/saftlib distclean
saftlib-clean::
$(MAKE) -C ip_cores/saftlib clean

saftlib-install::
$(MAKE) -C ip_cores/saftlib DESTDIR=$(STAGING) install
Expand Down Expand Up @@ -183,22 +192,27 @@ sdbfs::
sdbfs-clean::
$(MAKE) -C ip_cores/fpga-config-space/sdbfs DIRS="lib userspace" clean

lm32-elf-gcc.tar.xz:
wget https://github.com/GSI-CS-CO/lm32-toolchain/releases/download/v1.0-2019-05-27/lm32-elf-gcc.tar.xz
lm32-toolchain-download :
test -f lm32-gcc.tar.xz || wget https://github.com/GSI-CS-CO/lm32-toolchain/releases/download/v1.1-2023-04-04/lm32-gcc-4.5.3.tar.xz -O lm32-gcc.tar.xz

lm32-toolchain: lm32-toolchain-download
test -d lm32-gcc || tar -xf lm32-gcc.tar.xz
test -d lm32-gcc-4.5.3 && mv lm32-gcc-4.5.3 lm32-toolchain || true

toolchain: lm32-elf-gcc.tar.xz
tar xvJf lm32-elf-gcc.tar.xz
mv lm32-elf-gcc toolchain
touch toolchain
lm32-toolchain-clean::
rm -rf lm32-toolchain

toolchain-clean::
rm -rf toolchain
lm32-cluster-testbench-run:: lm32-toolchain hdlmake_install
make -C testbench/lm32_cluster/test run

lm32-cluster-testbench-clean:: lm32-toolchain hdlmake_install
make -C testbench/lm32_cluster/test clean

wrpc-sw-config::
test -s ip_cores/wrpc-sw/.config || \
$(MAKE) -C ip_cores/wrpc-sw/ gsi_defconfig

firmware: sdbfs etherbone toolchain wrpc-sw-config
firmware: sdbfs etherbone lm32-toolchain wrpc-sw-config
ifeq ($(UNAME), x86_64)
$(MAKE) -C ip_cores/wrpc-sw SDBFS=$(PWD)/ip_cores/fpga-config-space/sdbfs/userspace all
else
Expand Down Expand Up @@ -354,6 +368,30 @@ scu4-check:
scu4-clean::
$(MAKE) -C $(PATH_SCU4) clean

ftm4: firmware
$(MAKE) -C $(PATH_FTM4) all

ftm4-sort:
$(call sort_file, $(CHECK_FTM4))

ftm4-check:
$(call check_timing, $(CHECK_FTM4))

ftm4-clean::
$(MAKE) -C $(PATH_FTM4) clean

ftm4dp: firmware
$(MAKE) -C $(PATH_FTM4DP) all

ftm4dp-sort:
$(call sort_file, $(CHECK_FTM4DP))

ftm4dp-check:
$(call check_timing, $(CHECK_FTM4DP))

ftm4dp-clean::
$(MAKE) -C $(PATH_FTM4DP) clean

a10gx_pcie:: firmware
$(MAKE) -C $(PATH_A10GX) all

Expand Down Expand Up @@ -428,7 +466,7 @@ ifa8-clean::
# LM32 firmware
# #################################################################################################

bg: toolchain
bg: lm32-toolchain
$(MAKE) -C modules/burst_generator

bg-clean::
Expand All @@ -445,7 +483,7 @@ avsoc-clean::
$(MAKE) -C syn/gsi_avsoc/av_rocket_board clean

vetar:: firmware
$(MAKE) -C syn/gsi_vetar/wr_core_demo PATH=$(PWD)/toolchain/bin:$(PATH) all
$(MAKE) -C syn/gsi_vetar/wr_core_demo PATH=$(PWD)/lm32-toolchain/bin:$(PATH) all

vetar-clean::
$(MAKE) -C syn/gsi_vetar/wr_core_demo clean
Expand All @@ -457,12 +495,12 @@ exploder-clean::
$(MAKE) -C syn/gsi_exploder/wr_core_demo clean

pexarria10_soc:: firmware
$(MAKE) -C syn/gsi_pexarria10_soc/control PATH=$(PWD)/toolchain/bin:$(PATH) all
$(MAKE) -C syn/gsi_pexarria10_soc/control PATH=$(PWD)/lm-32toolchain/bin:$(PATH) all

pexarria10_soc-clean::
$(MAKE) -C syn/gsi_pexarria10_soc/control PATH=$(PWD)/toolchain/bin:$(PATH) clean
$(MAKE) -C syn/gsi_pexarria10_soc/control PATH=$(PWD)/lm-32toolchain/bin:$(PATH) clean

### We need to run ./fix-git.sh and ./install-hdlmake.sh: make them a prerequisite for Makefile
# We need to run ./fix-git.sh and ./install-hdlmake.sh: make them a prerequisite for Makefile
Makefile: prereq-rule

prereq-rule::
Expand All @@ -475,6 +513,14 @@ git_submodules_update:
git_submodules_init:
@./fix-git.sh

# Check if hdlmake 3.3 is already installed
hdlmake_install:
cd ip_cores/hdlmake/ && python setup.py install --user
export PATH=$$PATH:$$HOME/.local/bin
@rm .hdlmake 2>/dev/null || true
@hdlmake --version 2>/dev/null | grep 3.3 && echo "Info: Found hdlmake, skipping installation..." || echo "Info: Installing hdlmake..." > .hdlmake
@test -f .hdlmake && cd ip_cores/hdlmake/ && python setup.py install --user || true
@rm .hdlmake 2>/dev/null || true
@export PATH=$$PATH:$$HOME/.local/bin

# Just install hdlmake (even if it's already installed)
hdlmake_install_locally:
@cd ip_cores/hdlmake/ && python setup.py install --user
Loading