upgrading to [email protected]

slaclab · Jan 8, 2025 · d416dc4 · d416dc4
1 parent ae3aaf8
commit d416dc4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,5 +1,5 @@
 
-Copyright (c) 2024, The Board of Trustees of the Leland Stanford Junior 
+Copyright (c) 2025, The Board of Trustees of the Leland Stanford Junior 
 University, through SLAC National Accelerator Laboratory (subject to receipt 
 of any required approvals from the U.S. Dept. of Energy). All rights reserved. 
 Redistribution and use in source and binary forms, with or without 

diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ drwxr-xr-x 2 ruckman re 2.0K Feb  4 21:15 .
 
 ```bash
 $ source Simple-ZCU216-Example/firmware/vivado_setup.sh
-$ source /path/to/petalinux/2023.2/settings.sh
+$ source /path/to/petalinux/2024.2/settings.sh
 ```
 
 3) Go to the target directory and run the `CreatePetalinuxProject.sh` script with arg pointing to path of .XSA file:

diff --git a/firmware/submodules/aes-stream-drivers b/firmware/submodules/aes-stream-drivers
diff --git a/firmware/submodules/axi-soc-ultra-plus-core b/firmware/submodules/axi-soc-ultra-plus-core
diff --git a/firmware/submodules/ruckus b/firmware/submodules/ruckus
diff --git a/firmware/submodules/surf b/firmware/submodules/surf
diff --git a/firmware/targets/shared_version.mk b/firmware/targets/shared_version.mk
@@ -1,5 +1,5 @@
-# Define Firmware Version: v1.11.0.0
-export PRJ_VERSION = 0x01110000
+# Define Firmware Version: v2.0.0.0
+export PRJ_VERSION = 0x02000000
 
 # Include .XSA in image dir
 export GEN_XSA_IMAGE = 1

diff --git a/software/setup_env_slac.sh b/software/setup_env_slac.sh
@@ -6,4 +6,4 @@ source /afs/slac.stanford.edu/g/reseng/vol31/anaconda/anaconda3/etc/profile.d/co
 ##################################
 # Activate Rogue conda Environment
 ##################################
-conda activate rogue_v6.3.0
+conda activate rogue_v6.4.0
+28 −1		.github/workflows/aes_ci.yml
+38 −0		CPPLINT.cfg
+9 −3		common/app_lib/PrbsData.cpp
+1 −1		common/app_lib/PrbsData.h
+18 −18		common/driver/axi_version.c
+1 −1		common/driver/axi_version.h
+99 −99		common/driver/axis_gen2.c
+52 −52		common/driver/axis_gen2.h
+62 −51		common/driver/dma_buffer.c
+1 −1		common/driver/dma_buffer.h
+136 −131		common/driver/dma_common.c
+6 −7		common/driver/dma_common.h
+103 −22		common/driver/gpu_async.c
+5 −1		common/driver/gpu_async.h
+7 −2		data_dev/app/src/dmaRate.cpp
+12 −4		data_dev/app/src/dmaWrite.cpp
+7 −3		data_dev/app/src/setDebug.cpp
+6 −2		data_dev/app/src/test.cpp
+42 −42		data_dev/driver/src/data_dev_top.c
+1 −1		data_dev/driver/src/data_dev_top.h
+12 −4		data_gpu/driver/Makefile
+42 −8		data_gpu/driver/README.md
+41 −0		data_gpu/driver/build-nvidia.sh
+63 −63		data_gpu/driver/comp_and_load_drivers.sh
+5 −2		data_gpu/driver/dkms.conf
+1 −0		data_gpu/driver/src/GpuAsyncRegs.h
+49 −44		data_gpu/driver/src/data_gpu_top.c
+0 −1		data_gpu/driver/src/data_gpu_top.h
+6 −6		include/AxiVersion.h
+5 −5		include/AxisDriver.h
+4 −4		include/DataDriver.h
+5 −5		include/DmaDriver.h
+20 −5		include/GpuAsync.h
+242 −0		include/GpuAsyncRegs.h
+2 −2		petalinux/README.md
+0 −1		petalinux/aximemorymap/aximemorymap.bb
+0 −340		petalinux/aximemorymap/files/COPYING
+18 −18		petalinux/aximemorymap/files/aximemorymap.c
+1 −2		petalinux/aximemorymap/files/aximemorymap.h
+0 −1		petalinux/axistreamdma/axistreamdma.bb
+0 −340		petalinux/axistreamdma/files/COPYING
+9 −12		petalinux/axistreamdma/files/axistreamdma.c
+1 −0		pip_requirements.txt
+1 −6		rce_hp_buffers/driver/Makefile
+16 −18		rce_hp_buffers/driver/src/rce_hp.c
+4 −8		rce_hp_buffers/driver/src/rce_hp.h
+9 −13		rce_hp_buffers/driver/src/rce_top.c
+2 −6		rce_hp_buffers/driver/src/rce_top.h
+1 −7		rce_memmap/driver/Makefile
+27 −33		rce_memmap/driver/src/rce_map.c
+2 −9		rce_memmap/driver/src/rce_map.h
+1 −8		rce_stream/app/Makefile
+122 −116		rce_stream/app/src/dmaLoopTest.cpp
+51 −52		rce_stream/app/src/dmaRead.cpp
+19 −19		rce_stream/app/src/dmaSetDebug.cpp
+55 −53		rce_stream/app/src/dmaWrite.cpp
+1 −7		rce_stream/driver/Makefile
+80 −79		rce_stream/driver/src/axis_gen1.c
+24 −29		rce_stream/driver/src/axis_gen1.h
+30 −32		rce_stream/driver/src/rce_top.c
+1 −1		rce_stream/driver/src/rce_top.h
+58 −56		CreatePetalinuxProject.sh
+1 −1		LICENSE.txt
+3 −3		README.md
+3 −3		conda-recipe/meta.yaml
+1 −1		hardware/RealDigitalRfSoC4x2/petalinux/device-tree/system-user.dtsi
+1 −1		hardware/TrenzTe0835/petalinux/device-tree/system-user.dtsi
+5 −2		hardware/XilinxKriaKv260/petalinux/config
+1 −1		hardware/XilinxKriaKv260/petalinux/device-tree/system-user.dtsi
+380 −0		hardware/XilinxKriaKv260/petalinux/dts_dir/zynqmp-sck-kv-g-revB.dtso
+15 −0		hardware/XilinxKriaKv260/petalinux/petalinuxbsp.conf
+2 −0		hardware/XilinxKriaKv260/petalinux/u-boot/bsp.cfg
+2,344 −0		hardware/XilinxZcu102/bd/2023.1/AxiSocUltraPlusCpuCore.bd
+716 −0		hardware/XilinxZcu102/bd/2023.1/AxiSocUltraPlusCpuCore.tcl
+7 −0		hardware/XilinxZcu102/petalinux/config
+1 −0		hardware/XilinxZcu102/petalinux/device-tree/device-tree.bbappend
+40 −0		hardware/XilinxZcu102/petalinux/device-tree/system-user.dtsi
+3 −0		hardware/XilinxZcu102/petalinux/u-boot/platform-top.h
+26 −0		hardware/XilinxZcu102/rtl/HardwareTypePkg.vhd
+25 −0		hardware/XilinxZcu102/ruckus.tcl
+20 −0		hardware/XilinxZcu102/xdc/XilinxZcu102.xdc
+1 −1		hardware/XilinxZcu111/petalinux/device-tree/system-user.dtsi
+1 −1		hardware/XilinxZcu208/petalinux/device-tree/system-user.dtsi
+1 −1		hardware/XilinxZcu216/petalinux/device-tree/system-user.dtsi
+1 −1		hardware/XilinxZcu670/petalinux/device-tree/system-user.dtsi
+2 −2		petalinux-apps/rfdc-test/rfdc-test.bb
+10 −8		petalinux-apps/rogue.bb
+1 −1		petalinux-apps/roguetcpbridge/files/roguetcpbridge
+2 −2		petalinux-apps/startup-app-init/files/startup-app-init
+1 −0		python/axi_soc_ultra_plus_core/_AxiVersion.py
+1 −0		shared/rtl/AxiSocUltraPlusPkg.vhd
+2 −2		.github/workflows/conda_build_lib.yml
+4 −4		.github/workflows/conda_build_proj.yml
+59 −0		.github/workflows/conda_build_win.yml
+8 −30		.github/workflows/ruckus_ci.yml
+88 −0		system_vitis_unified_hls.mk
+1 −1		system_vivado.mk
+90 −0		vitis/hls/build.py
+44 −0		vitis/hls/create_proj.py
+4 −0		vivado/gui.tcl
+70 −8		vivado/proc/code_loading.tcl
+15 −0		vivado/proc/debug_probes.tcl
+4 −0		vivado/proc/ip_management.tcl
+1 −1		vivado/proc/project_management.tcl
+4 −4		vivado/vcs.tcl