diff --git a/LICENSE.txt b/LICENSE.txt index 17a292b..c5e6f8b 100644 --- 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 index 0e2d250..66de2c1 100644 --- 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 index 7da8ea0..f39dbf8 160000 --- a/firmware/submodules/aes-stream-drivers +++ b/firmware/submodules/aes-stream-drivers @@ -1 +1 @@ -Subproject commit 7da8ea05620fc94a3d2cc835fa29136ca85bc7af +Subproject commit f39dbf8c10869ac5231c8cae4dd9c8576d098dc0 diff --git a/firmware/submodules/axi-soc-ultra-plus-core b/firmware/submodules/axi-soc-ultra-plus-core index a616767..4690ae2 160000 --- a/firmware/submodules/axi-soc-ultra-plus-core +++ b/firmware/submodules/axi-soc-ultra-plus-core @@ -1 +1 @@ -Subproject commit a616767c5c47c436f9511df9e1fb4960cae35597 +Subproject commit 4690ae237331bb634d4ad5268570990b0bf98183 diff --git a/firmware/submodules/ruckus b/firmware/submodules/ruckus index 0f95db6..6932e70 160000 --- a/firmware/submodules/ruckus +++ b/firmware/submodules/ruckus @@ -1 +1 @@ -Subproject commit 0f95db6a54c4870940cb291d5a59923a3cb4c60f +Subproject commit 6932e700a1ace5a9f4b4aae973f4f4c7ef0d8365 diff --git a/firmware/submodules/surf b/firmware/submodules/surf index 96662e1..e1130e1 160000 --- a/firmware/submodules/surf +++ b/firmware/submodules/surf @@ -1 +1 @@ -Subproject commit 96662e19fa764a3df9e101bba7b6498ebda01dc6 +Subproject commit e1130e125c05e9b7edf29d2925ae21c3eb76d82d diff --git a/firmware/targets/shared_version.mk b/firmware/targets/shared_version.mk index 2358a41..cbc15cd 100644 --- 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 index 03e186e..b3d9a4a 100644 --- 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