From 60833abd3b466c36a8a355a68dfe67d196076ced Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 17 Oct 2021 11:26:06 +0200 Subject: [PATCH 1/2] mistral: Support the new routes-to-bin intermediate tool generation --- mistral/family.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/mistral/family.cmake b/mistral/family.cmake index 80b67e63..4f135391 100644 --- a/mistral/family.cmake +++ b/mistral/family.cmake @@ -1,6 +1,7 @@ set(MISTRAL_ROOT "" CACHE STRING "Mistral install path") set(MISTRAL_DONT_INSTALL ON) +add_subdirectory(${MISTRAL_ROOT}/routes-to-bin ${CMAKE_CURRENT_BINARY_DIR}/routes-to-bin) add_subdirectory(${MISTRAL_ROOT}/libmistral ${CMAKE_CURRENT_BINARY_DIR}/libmistral) find_package(LibLZMA REQUIRED) From d90de7f696bb9bdcaa5709e7626ec597767c0034 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 17 Oct 2021 19:11:37 +0200 Subject: [PATCH 2/2] Sync mistral version in CI --- .github/workflows/mistral_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mistral_ci.yml b/.github/workflows/mistral_ci.yml index ca3ceb11..e48b2d44 100644 --- a/.github/workflows/mistral_ci.yml +++ b/.github/workflows/mistral_ci.yml @@ -21,7 +21,7 @@ jobs: - name: Execute build nextpnr env: MISTRAL_PATH: ${{ github.workspace }}/deps/mistral - MISTRAL_REVISION: b5bd534444364688a57e4c0f99af1bb4037a495a + MISTRAL_REVISION: 8f78291541df10d70fde6c9c58765c437807c68d run: | source ./.github/ci/build_mistral.sh get_dependencies