miegl/b210-k7-fpga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpga: tools: Update Vivado scripts to use python3

Browse Source 
Original-commit: 38c2a19e04c6e0467a6cc79977ab51a030f9735d
This commit is contained in:
Wade Fife
2021-12-08 12:07:36 -08:00
committed by Aaron Rossetto
parent 73506997bd
commit e7f0945319
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/scripts/setupenv_base.sh
+4 -4
View File
@@ -342,7 +342,7 @@ function viv_create_ip {
ip_name=$1 ip_name=$1
ip_dir=$(readlink -f $2) ip_dir=$(readlink -f $2)
ip_vlnv=$3 ip_vlnv=$3
part_name=$(python $REPO_BASE_PATH/tools/scripts/viv_gen_part_id.py "${PRODUCT_ID_MAP[$4]}") part_name=$(python3 $REPO_BASE_PATH/tools/scripts/viv_gen_part_id.py "${PRODUCT_ID_MAP[$4]}")
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "ERROR: Invalid product name $4. Supported: ${!PRODUCT_ID_MAP[@]}" echo "ERROR: Invalid product name $4. Supported: ${!PRODUCT_ID_MAP[@]}"
return 1 return 1
@@ -392,7 +392,7 @@ function viv_modify_bd {
fi fi
bd_path=$(readlink -f $1) bd_path=$(readlink -f $1)
part_name=$(python $REPO_BASE_PATH/tools/scripts/viv_gen_part_id.py "${PRODUCT_ID_MAP[$2]}") part_name=$(python3 $REPO_BASE_PATH/tools/scripts/viv_gen_part_id.py "${PRODUCT_ID_MAP[$2]}")
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "ERROR: Invalid product name $2. Supported: ${!PRODUCT_ID_MAP[@]}" echo "ERROR: Invalid product name $2. Supported: ${!PRODUCT_ID_MAP[@]}"
return 1 return 1
@@ -416,7 +416,7 @@ function viv_modify_tcl_bd {
fi fi
src_path=$(readlink -f $1) src_path=$(readlink -f $1)
part_name=$(python $REPO_BASE_PATH/tools/scripts/viv_gen_part_id.py "${PRODUCT_ID_MAP[$2]}") part_name=$(python3 $REPO_BASE_PATH/tools/scripts/viv_gen_part_id.py "${PRODUCT_ID_MAP[$2]}")
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "ERROR: Invalid product name $2. Supported: ${!PRODUCT_ID_MAP[@]}" echo "ERROR: Invalid product name $2. Supported: ${!PRODUCT_ID_MAP[@]}"
return 1 return 1
@@ -441,7 +441,7 @@ function viv_ls_ip {
return 1 return 1
fi fi
part_name=$(python $REPO_BASE_PATH/tools/scripts/viv_gen_part_id.py "${PRODUCT_ID_MAP[$1]}") part_name=$(python3 $REPO_BASE_PATH/tools/scripts/viv_gen_part_id.py "${PRODUCT_ID_MAP[$1]}")
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "ERROR: Invalid product name $1. Supported: ${!PRODUCT_ID_MAP[@]}" echo "ERROR: Invalid product name $1. Supported: ${!PRODUCT_ID_MAP[@]}"
return 1 return 1