From e4fcd3740dd8a650922903db6e15f4eaff25b5ee Mon Sep 17 00:00:00 2001 From: gatecat Date: Fri, 17 Mar 2023 09:27:36 +0100 Subject: cmake: Make HeAP placer always-enabled Signed-off-by: gatecat --- machxo2/README.md | 2 +- machxo2/arch.cc | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'machxo2') diff --git a/machxo2/README.md b/machxo2/README.md index 55cc5763..37dfb991 100644 --- a/machxo2/README.md +++ b/machxo2/README.md @@ -81,7 +81,7 @@ git clone git@github.com:cr1901/nextpnr.git cd nextpnr git checkout machxo2 git submodule update --init --recursive -cmake . -DARCH=machxo2 -DBUILD_GUI=OFF -DTRELLIS_INSTALL_PREFIX=/usr -DBUILD_PYTHON=OFF -DBUILD_HEAP=OFF +cmake . -DARCH=machxo2 -DBUILD_GUI=OFF -DTRELLIS_INSTALL_PREFIX=/usr -DBUILD_PYTHON=OFF make ``` diff --git a/machxo2/arch.cc b/machxo2/arch.cc index 60e2203c..82dd51fd 100644 --- a/machxo2/arch.cc +++ b/machxo2/arch.cc @@ -486,17 +486,9 @@ bool Arch::isBelLocationValid(BelId bel, bool explain_invalid) const return true; } -#ifdef WITH_HEAP const std::string Arch::defaultPlacer = "heap"; -#else -const std::string Arch::defaultPlacer = "sa"; -#endif - -const std::vector Arch::availablePlacers = {"sa", -#ifdef WITH_HEAP - "heap" -#endif -}; + +const std::vector Arch::availablePlacers = {"sa", "heap"}; const std::string Arch::defaultRouter = "router1"; const std::vector Arch::availableRouters = {"router1", "router2"}; -- cgit v1.2.3