Skip to content

Commit 839b4ad

Browse files
committed
AMD tools version 2025.1 amd Ubuntu 24.04, Rhel 9.4 support
* Build Version 2.4.0 * AMD tools version 2025.1 * Add Ubuntu 24.04 and Rhel 9.4 support * AMC SDT build flow * Add git hash and date to build artifacts * AMI tool cfgmem_copy command segfault fix * Add kernel version check to support kernel version 5.14.x - 6.8.x * AMI logging thread minor fix * FreeRTOS tick rate hz updated to 1000 * Code improvements and fixes
1 parent 7497599 commit 839b4ad

149 files changed

Lines changed: 34149 additions & 15109 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.

.gitignore

100644100755
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
##
2+
# Copyright (C) 2023 - 2025 Advanced Micro Devices, Inc. All rights reserved.
3+
# SPDX-License-Identifier: MIT
4+
15
# Object files
26
*.o
37
*.a

README.md

100644100755
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
##### Copyright (C) 2023 - 2025 Advanced Micro Devices, Inc. All rights reserved.
2+
##### SPDX-License-Identifier: MIT
13
# AVED
24

35
Full documentation for the ALVEO Versal Example Design can be found at the following link:

deploy/scripts/versal_change_boot_mode.tcl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
# (c) Copyright 2023, Advanced Micro Devices, Inc.
2-
#
3-
# Permission is hereby granted, free of charge, to any person obtaining a
4-
# copy of this software and associated documentation files (the "Software"),
5-
# to deal in the Software without restriction, including without limitation
6-
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
7-
# and/or sell copies of the Software, and to permit persons to whom the
1+
# Copyright (C) 2023 - 2025 Advanced Micro Devices, Inc.
2+
#
3+
# Permission is hereby granted, free of charge, to any person obtaining a
4+
# copy of this software and associated documentation files (the "Software"),
5+
# to deal in the Software without restriction, including without limitation
6+
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
7+
# and/or sell copies of the Software, and to permit persons to whom the
88
# Software is furnished to do so, subject to the following conditions:
9-
#
10-
# The above copyright notice and this permission notice shall be included in
9+
#
10+
# The above copyright notice and this permission notice shall be included in
1111
# all copies or substantial portions of the Software.
12-
#
13-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
16-
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18-
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
12+
#
13+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
16+
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
1919
# DEALINGS IN THE SOFTWARE.
2020
############################################################
2121
tar -set -filter {name =~ "Versal *"}

fw/.gitkeep

100644100755
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
##
2+
# Copyright (C) 2023 - 2025 Advanced Micro Devices, Inc. All rights reserved.
3+
# SPDX-License-Identifier: MIT
4+

fw/AMC/CMakeLists.txt

100644100755
Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
1+
# Copyright (c) 2023 - 2025 Advanced Micro Devices, Inc. All rights reserved.
22
# SPDX-License-Identifier: MIT
33

44
cmake_minimum_required(VERSION 3.5.0)
@@ -54,6 +54,7 @@ else()
5454
endif()
5555

5656
if(OS MATCHES "^(FreeRTOS)$")
57+
add_definitions(-DSDT)
5758
set(CMAKE_C_COMPILER armr5-none-eabi-gcc)
5859
set(CMAKE_SYSTEM_NAME Generic)
5960
set(CMAKE_SYSTEM_PROCESSOR arm)
@@ -147,14 +148,18 @@ else()
147148
execute_process(COMMAND ./getVersion.sh smbus WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/device_drivers/smbus_driver )
148149

149150
#adding static libraries
150-
find_library(FREERTOS_LIB NAMES freertos PATHS amc_bsp/psv_cortexr5_0/freertos10_xilinx_domain/bsp/psv_cortexr5_0/lib)
151-
find_library(XIL_LIB NAMES xil PATHS amc_bsp/psv_cortexr5_0/freertos10_xilinx_domain/bsp/psv_cortexr5_0/lib)
152-
find_library(XIL_FPGA NAMES xilfpga PATHS amc_bsp/psv_cortexr5_0/freertos10_xilinx_domain/bsp/psv_cortexr5_0/lib)
153-
find_library(XIL_MAILBOX NAMES xilmailbox PATHS amc_bsp/psv_cortexr5_0/freertos10_xilinx_domain/bsp/psv_cortexr5_0/lib)
151+
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH};amc_bsp/amc_bsp/lib)
152+
find_library(FREERTOS_LIB NAMES freertos PATHS ${CMAKE_LIBRARY_PATH})
153+
find_library(XIL_LIB NAMES xil PATHS ${CMAKE_LIBRARY_PATH})
154+
find_library(XIL_TIMER NAMES xiltimer PATHS ${CMAKE_LIBRARY_PATH})
155+
find_library(XIL_FPGA NAMES xilfpga PATHS ${CMAKE_LIBRARY_PATH})
156+
find_library(XIL_MAILBOX NAMES xilmailbox PATHS ${CMAKE_LIBRARY_PATH})
157+
find_library(XIL_STANDALONE NAMES xilstandalone PATHS ${CMAKE_LIBRARY_PATH})
154158

155159
#Include directories
156-
include_directories(amc_bsp/psv_cortexr5_0/freertos10_xilinx_domain/bsp/psv_cortexr5_0/include)
157-
include_directories(amc_bsp/psv_cortexr5_0/freertos10_xilinx_domain/bsp/psv_cortexr5_0/lib)
160+
include_directories(amc_bsp/amc_bsp/include)
161+
include_directories(${CMAKE_LIBRARY_PATH})
162+
include_directories(build)
158163
include_directories(src/common/include)
159164
include_directories(src/common/core_libs/pll)
160165
include_directories(src/common/core_libs/evl)
@@ -309,7 +314,7 @@ else()
309314

310315
#linking libraries with executable
311316
if(OS MATCHES "^(FreeRTOS)$")
312-
target_link_libraries(amc.elf "-Wl,-T -Wl,../src/lscript.ld" -Wl,--start-group,${XIL_LIB},${FREERTOS_LIB},-lgcc,-lc,--end-group -Wl,--start-group,${XIL_FPGA},${XIL_LIB},-lgcc,-lc,--end-group -Wl,--start-group,${XIL_MAILBOX},${XIL_LIB},-lgcc,-lc,--end-group)
317+
target_link_libraries(amc.elf "-Wl,-T -Wl,${amc_SOURCE_DIR}/src/lscript.ld" -Wl,--start-group,${XIL_TIMER},${XIL_STANDALONE},${XIL_LIB},${FREERTOS_LIB},-lgcc,-lc,--end-group -Wl,--start-group,${XIL_FPGA},${XIL_LIB},-lgcc,-lc,--end-group -Wl,--start-group,${XIL_TIMER},${XIL_STANDALONE},${XIL_MAILBOX},${XIL_LIB},-lgcc,-lc,--end-group)
313318
target_compile_definitions(amc.elf PRIVATE $<$<CONFIG:Debug>:DEBUG_PRINT> GCQ_MAX_INSTANCES=1)
314319
endif()
315320

fw/AMC/build/amc_version.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

fw/AMC/merge_amc_version.json

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"BUILD_BRANCH": "",
33
"VERSION_HASH": "37139f62ff1333680cda75c952112a85c01e131d",
4-
"VERSION_HASH_DATE": "20240725",
5-
"AMC_VERSION_RELEASE": "2.3.0",
4+
"VERSION_HASH_DATE": "20250821",
5+
"AMC_VERSION_RELEASE": "2.4.0",
66
"AMC_VERSION_MAJOR": 2,
7-
"AMC_VERSION_MINOR": 3,
7+
"AMC_VERSION_MINOR": 4,
88
"AMC_VERSION_PATCH": 0,
99
"AMC_DEV_COMMITS": 0,
1010
"AMC_DEV_STATUS": 0,

fw/AMC/scripts/build.sh

Lines changed: 10 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
3+
# Copyright (c) 2023 - 2025 Advanced Micro Devices, Inc. All rights reserved.
44
# SPDX-License-Identifier: MIT
55

66
################################################################################
@@ -34,23 +34,20 @@ SCRIPT_START_TIME=$SECONDS
3434

3535
chmod +x $SCRIPTS_DIR/*
3636

37-
### Array of required git filenames ###
38-
GIT_FILES=(".uncrustify_rtos.cfg" "function_header.txt" "pre-commit" "commit-msg")
39-
4037
################################################################################
4138
### Functions ###
4239
################################################################################
4340

4441
function clean() {
4542
SECTION_START=$SECONDS
4643
echo "=== Removing BSP, build, and CMake files ==="
47-
rm -r $ROOT_DIR/.Xil/
48-
rm -r $ROOT_DIR/.metadata/
49-
rm -r $BSP_DIR/
50-
rm -r $ROOT_DIR/.analytics
51-
rm -r $ROOT_DIR/IDE.log
44+
rm -rf $ROOT_DIR/.Xil/
45+
rm -rf $ROOT_DIR/.metadata/
46+
rm -rf $BSP_DIR/
47+
rm -rf $ROOT_DIR/.analytics
48+
rm -rf $ROOT_DIR/IDE.log
5249

53-
rm -r $BUILD_DIR
50+
rm -rf $BUILD_DIR
5451
echo "*** Cleaning took $((SECONDS - $SECTION_START)) S ***"
5552
}
5653

@@ -59,7 +56,7 @@ function clean_static_analysis() {
5956
echo "=== Static analysis clean ==="
6057
cd $BUILD_DIR
6158
make clean
62-
rm -r coverity/
59+
rm -rf coverity/
6360

6461
echo "*** Cleaning took $((SECONDS - $SECTION_START)) S ***"
6562
}
@@ -90,29 +87,6 @@ function print_help() {
9087
echo "========================================================================================="
9188
}
9289

93-
function check_workspace_setup() {
94-
for file in "${GIT_FILES[@]}"
95-
do
96-
if [ -f ".git/hooks/$file" ]; then
97-
echo "Checking ==> $file"
98-
else
99-
echo "Checking ==> $file"
100-
echo "Error: file does not exist."
101-
echo "Please run ./scripts/setupWorkspace.sh"
102-
exit 1
103-
fi
104-
done
105-
106-
echo "Checking ==> uncrustify is installed"
107-
check=$(command -v uncrustify)
108-
109-
if [ $? -ne 0 ]; then
110-
echo "Error: uncrustify is not installed."
111-
echo "Please run ./scripts/setupWorkspace.sh"
112-
exit 1
113-
fi
114-
}
115-
11690
################################################################################
11791

11892
################################################################################
@@ -137,7 +111,7 @@ while [ $# -gt 0 ]; do
137111
### clean AMC application files ###
138112
if [ -d "$BUILD_DIR" ]; then
139113
echo "=== Removing $BUILD_DIR ==="
140-
rm -r $BUILD_DIR
114+
rm -rf $BUILD_DIR
141115
fi
142116
exit 0;;
143117
-amc)
@@ -188,12 +162,9 @@ while [ $# -gt 0 ]; do
188162
shift ### shift to next passed option ###
189163
done
190164

191-
# Check setupWorkspace.sh script has run, and that uncrustify is installed.
192-
# check_workspace_setup
193-
194165
# Remake build direcory
195166
if [ -d "$BUILD_DIR" ]; then
196-
rm -r $BUILD_DIR/
167+
rm -rf $BUILD_DIR/
197168
fi
198169
mkdir $BUILD_DIR
199170

0 commit comments

Comments
 (0)