diff options
| author | gatecat <gatecat@ds0.me> | 2023-03-17 09:27:36 +0100 |
|---|---|---|
| committer | myrtle <gatecat@ds0.me> | 2023-03-17 10:38:11 +0100 |
| commit | e4fcd3740dd8a650922903db6e15f4eaff25b5ee (patch) | |
| tree | 788ef589fcba0f4c95d02c900a060cd3b54d4215 /machxo2 | |
| parent | 4111cc25d653bde9fbda72b9cf9dc13a876e214a (diff) | |
| download | nextpnr-e4fcd3740dd8a650922903db6e15f4eaff25b5ee.tar.gz nextpnr-e4fcd3740dd8a650922903db6e15f4eaff25b5ee.tar.bz2 nextpnr-e4fcd3740dd8a650922903db6e15f4eaff25b5ee.zip | |
cmake: Make HeAP placer always-enabled
Signed-off-by: gatecat <gatecat@ds0.me>
Diffstat (limited to 'machxo2')
| -rw-r--r-- | machxo2/README.md | 2 | ||||
| -rw-r--r-- | machxo2/arch.cc | 12 |
2 files changed, 3 insertions, 11 deletions
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<std::string> Arch::availablePlacers = {"sa", -#ifdef WITH_HEAP - "heap" -#endif -}; + +const std::vector<std::string> Arch::availablePlacers = {"sa", "heap"}; const std::string Arch::defaultRouter = "router1"; const std::vector<std::string> Arch::availableRouters = {"router1", "router2"}; |