From 6cc6113d5a5e3a6463f3e3923efee613acc50579 Mon Sep 17 00:00:00 2001 From: David Shah Date: Sun, 8 Jul 2018 17:24:35 +0200 Subject: ecp5: Link libtrellis library to ecp5 binary Signed-off-by: David Shah --- ecp5/family.cmake | 8 ++++++++ ecp5/main.cc | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/ecp5/family.cmake b/ecp5/family.cmake index 7f528886..190a3345 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -39,3 +39,11 @@ else() endforeach (target) endforeach (dev) endif() + +find_library(TRELLIS_LIB trellis PATHS ${TRELLIS_ROOT}/libtrellis) + +foreach (target ${family_targets}) + target_compile_definitions(${target} PRIVATE TRELLIS_ROOT="${TRELLIS_ROOT}") + target_include_directories(${target} PRIVATE ${TRELLIS_ROOT}/libtrellis/include) + target_link_libraries(${target} PRIVATE ${TRELLIS_LIB}) +endforeach (target) diff --git a/ecp5/main.cc b/ecp5/main.cc index c07e08de..c16e23bb 100644 --- a/ecp5/main.cc +++ b/ecp5/main.cc @@ -31,6 +31,9 @@ #include #include #include + +#include "Database.hpp" + #include "log.h" #include "nextpnr.h" #include "version.h" @@ -99,6 +102,9 @@ int main(int argc, char *argv[]) "sha1 " GIT_COMMIT_HASH_STR ")\n"; return 1; } + + Trellis::load_database(TRELLIS_ROOT"/database"); + ArchArgs args; args.type = ArchArgs::LFE5U_25F; args.package = "CABGA381"; -- cgit v1.2.3