aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5
diff options
context:
space:
mode:
Diffstat (limited to 'ecp5')
-rw-r--r--ecp5/arch.cc2
-rw-r--r--ecp5/bitstream.cc4
-rw-r--r--ecp5/pack.cc4
3 files changed, 4 insertions, 6 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index 6cd83cce..9c059005 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -511,7 +511,7 @@ bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort
delay.delay = 193;
return true;
}
-#if 0 //FIXME
+#if 0 // FIXME
if (fromPort == id_WCK && (toPort == id_F0 || toPort == id_F1)) {
delay.delay = 717;
return true;
diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc
index d8914f1a..0c2d511d 100644
--- a/ecp5/bitstream.cc
+++ b/ecp5/bitstream.cc
@@ -270,14 +270,12 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex
}
if (str_or_default(ci->params, ctx->id("MODE"), "LOGIC") == "DPRAM" && slice == "SLICEA") {
- cc.tiles[tname].add_enum(slice + ".WREMUX",
- str_or_default(ci->params, ctx->id("WREMUX"), "WRE"));
+ cc.tiles[tname].add_enum(slice + ".WREMUX", str_or_default(ci->params, ctx->id("WREMUX"), "WRE"));
// FIXME: WCKMUX
NPNR_ASSERT(str_or_default(ci->params, ctx->id("WCKMUX"), "WCK") == "WCK");
}
-
// Tie unused inputs high
for (auto input : {id_A0, id_B0, id_C0, id_D0, id_A1, id_B1, id_C1, id_D1}) {
if (ci->ports.find(input) == ci->ports.end() || ci->ports.at(input).net == nullptr) {
diff --git a/ecp5/pack.cc b/ecp5/pack.cc
index 3ba6e238..8e33356e 100644
--- a/ecp5/pack.cc
+++ b/ecp5/pack.cc
@@ -525,7 +525,7 @@ class Ecp5Packer
if (f1net != nullptr) {
ff1 = net_only_drives(ctx, f1net, is_ff, ctx->id("DI"), false);
if (ff1 != nullptr && (ff0 == nullptr || can_pack_ffs(ff0, ff1)) &&
- can_add_ff_to_tile(tile_ffs, ff1)) {
+ can_add_ff_to_tile(tile_ffs, ff1)) {
ff_packing.push_back(std::make_tuple(ff1, slice.get(), 1));
tile_ffs.push_back(ff1);
packed_cells.insert(ff1->name);
@@ -609,7 +609,7 @@ class Ecp5Packer
if (f1net != nullptr) {
ff1 = net_only_drives(ctx, f1net, is_ff, ctx->id("DI"), false);
if (ff1 != nullptr && (ff0 == nullptr || can_pack_ffs(ff0, ff1)) &&
- can_add_ff_to_tile(tile_ffs, ff1)) {
+ can_add_ff_to_tile(tile_ffs, ff1)) {
ff_packing.push_back(std::make_tuple(ff1, slice, 1));
tile_ffs.push_back(ff1);
packed_cells.insert(ff1->name);