diff options
| author | gatecat <gatecat@ds0.me> | 2021-03-23 17:33:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 17:33:55 +0000 |
| commit | 3cc50a5744beeae63ffb9ecd2064666e90d26be4 (patch) | |
| tree | c8e66be71668d0baf20f2e92bc1755d8ebbabafa /fpga_interchange/examples | |
| parent | 323da87dec3819a100b7d5d19a1ddd2340f26caa (diff) | |
| parent | 720f64ea6017fa3e42f80eba64cc615c64788914 (diff) | |
| download | nextpnr-3cc50a5744beeae63ffb9ecd2064666e90d26be4.tar.gz nextpnr-3cc50a5744beeae63ffb9ecd2064666e90d26be4.tar.bz2 nextpnr-3cc50a5744beeae63ffb9ecd2064666e90d26be4.zip | |
Merge pull request #644 from litghost/add_global_buffers
[FPGA interchange] Add support for global buffers from chipdb.
Diffstat (limited to 'fpga_interchange/examples')
| -rw-r--r-- | fpga_interchange/examples/chipdb.cmake | 14 | ||||
| -rw-r--r-- | fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/fpga_interchange/examples/chipdb.cmake b/fpga_interchange/examples/chipdb.cmake index 676c8c77..986ae571 100644 --- a/fpga_interchange/examples/chipdb.cmake +++ b/fpga_interchange/examples/chipdb.cmake @@ -210,7 +210,7 @@ function(generate_chipdb) # device <common device> # part <part> # device_target <device target> - # bel_bucket_seeds <bel bucket seeds> + # device_config <device config> # test_package <test_package> # ) # ~~~ @@ -228,7 +228,9 @@ function(generate_chipdb) # share the same xc7a35t device prefix # - part: one among the parts available for a given device # - device_target: target for the device from which the chipdb is generated - # - bel_bucket_seeds: path to the bel bucket seeds YAML file + # - device_config: path to the device configYAML file + # This file specifies some nextpnr specific data, such as BEL bucket + # seeds and global BEL names. # - test_package: package among the ones available for the device. This is used for architecture # testing only # @@ -241,7 +243,7 @@ function(generate_chipdb) # as the binary chipdb set(options) - set(oneValueArgs family device part device_target bel_bucket_seeds test_package) + set(oneValueArgs family device part device_target device_config test_package) set(multiValueArgs) cmake_parse_arguments( @@ -256,7 +258,7 @@ function(generate_chipdb) set(device ${generate_chipdb_device}) set(part ${generate_chipdb_part}) set(device_target ${generate_chipdb_device_target}) - set(bel_bucket_seeds ${generate_chipdb_bel_bucket_seeds}) + set(device_config ${generate_chipdb_device_config}) set(test_package ${generate_chipdb_test_package}) get_target_property(device_loc ${device_target} LOCATION) @@ -267,10 +269,10 @@ function(generate_chipdb) ${PYTHON_EXECUTABLE} -mfpga_interchange.nextpnr_emit --schema_dir ${INTERCHANGE_SCHEMA_PATH} --output_dir ${CMAKE_CURRENT_BINARY_DIR} - --bel_bucket_seeds ${bel_bucket_seeds} + --device_config ${device_config} --device ${device_loc} DEPENDS - ${bel_bucket_seeds} + ${device_config} ${device_target} ${device_loc} ) diff --git a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt index ce5d5d2d..636440c4 100644 --- a/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt +++ b/fpga_interchange/examples/devices/xc7a35t/CMakeLists.txt @@ -9,6 +9,6 @@ generate_chipdb( device xc7a35t part xc7a35tcsg324-1 device_target ${xc7a35t_target} - bel_bucket_seeds ${PYTHON_INTERCHANGE_PATH}/test_data/series7_bel_buckets.yaml + device_config ${PYTHON_INTERCHANGE_PATH}/test_data/series7_device_config.yaml test_package csg324 ) |