caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interchange: Fix nexus cmake review comments

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2021-03-31 10:11:09 +01:00
parent 9259763599
commit 3678eff5dc
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/ci/build_interchange.sh vendored
View File

@ -35,19 +35,19 @@ function get_dependencies {
python3 -m pip install -r requirements.txt python3 -m pip install -r requirements.txt
popd popd
## Install RapidWright
git clone https://github.com/Xilinx/RapidWright.git ${RAPIDWRIGHT_PATH}
pushd ${RAPIDWRIGHT_PATH}
make update_jars
popd
# Install prjoxide
if [ ${DEVICE} == "LIFCL-17" ]; then if [ ${DEVICE} == "LIFCL-17" ]; then
# Install prjoxide
curl --proto '=https' -sSf https://sh.rustup.rs | sh -s -- -y curl --proto '=https' -sSf https://sh.rustup.rs | sh -s -- -y
git clone --recursive https://github.com/gatecat/prjoxide.git git clone --recursive https://github.com/gatecat/prjoxide.git
pushd prjoxide/libprjoxide pushd prjoxide/libprjoxide
PATH=$PATH:$HOME/.cargo/bin cargo install --path prjoxide --all-features PATH=$PATH:$HOME/.cargo/bin cargo install --path prjoxide --all-features
popd popd
else
# Install RapidWright
git clone https://github.com/Xilinx/RapidWright.git ${RAPIDWRIGHT_PATH}
pushd ${RAPIDWRIGHT_PATH}
make update_jars
popd
fi fi
} }

2
fpga_interchange/examples/chipdb.cmake
View File

@ -100,7 +100,7 @@ function(patch_device_with_prim_lib)
# ) # )
# ~~~ # ~~~
# #
# Generates a patched device database starting from an input device # Patches an input device with a primitive library from Yosys
# #
# If output_target is specified, the variable named as the output_target # If output_target is specified, the variable named as the output_target
# parameter value is set to the generated output_device_file target. # parameter value is set to the generated output_device_file target.

10
fpga_interchange/examples/chipdb_nexus.cmake
View File

@ -1,6 +1,6 @@
function(create_prjoxide_device_db) function(create_prjoxide_device_db)
# ~~~ # ~~~
# create_rapidwright_device_db( # create_prjoxide_device_db(
# device <common device> # device <common device>
# output_target <output device target> # output_target <output device target>
# ) # )
@ -56,22 +56,19 @@ function(generate_nexus_device_db)
# ~~~ # ~~~
# generate_nexus_device_db( # generate_nexus_device_db(
# device <common device> # device <common device>
# part <part>
# device_target <variable name for device target> # device_target <variable name for device target>
# ) # )
# ~~~ # ~~~
# #
# Generates a chipdb BBA file, starting from a Project Oxide device database. # Generates a chipdb BBA file, starting from a Project Oxide device database.
# Patches applied: # Patches applied:
# - constraints patch # - primitive library from Yosys
# - luts patch
# #
# Arguments: # Arguments:
# - device: common device name of a set of parts. E.g. LIFCL-17 # - device: common device name of a set of parts. E.g. LIFCL-17
# - part: one among the parts available for a given device (currently ignored)
# - device_target: variable name that will hold the output device target for the parent scope # - device_target: variable name that will hold the output device target for the parent scope
set(options) set(options)
set(oneValueArgs device part device_target) set(oneValueArgs device device_target)
set(multiValueArgs) set(multiValueArgs)
cmake_parse_arguments( cmake_parse_arguments(
@ -83,7 +80,6 @@ function(generate_nexus_device_db)
) )
set(device ${generate_nexus_device_db_device}) set(device ${generate_nexus_device_db_device})
set(part ${generate_nexus_device_db_part})
set(device_target ${generate_nexus_device_db_device_target}) set(device_target ${generate_nexus_device_db_device_target})
create_prjoxide_device_db( create_prjoxide_device_db(

1
fpga_interchange/examples/devices/LIFCL-17/CMakeLists.txt
View File

@ -1,6 +1,5 @@
generate_nexus_device_db( generate_nexus_device_db(
device LIFCL-17 device LIFCL-17
part LIFCL-17-7SG72C
device_target lifcl17_target device_target lifcl17_target
) )