diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index 51f4db84..cdffad69 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -94,7 +94,7 @@ static const ChipInfoPOD *get_chip_info(const RelPtr<ChipInfoPOD> *ptr) { return
 void load_chipdb();
 #endif
 
-#define LFE5U_45F_ONLY
+//#define LFE5U_45F_ONLY
 
 Arch::Arch(ArchArgs args) : args(args)
 {
diff --git a/ecp5/cells.cc b/ecp5/cells.cc
index ddd1130d..63916acf 100644
--- a/ecp5/cells.cc
+++ b/ecp5/cells.cc
@@ -31,7 +31,7 @@ void add_port(const Context *ctx, CellInfo *cell, std::string name, PortType dir
 }
 
 
-std::unique_ptr<CellInfo> create_ecp5_cell(Context *ctx, IdString type, std::string name = "") {
+std::unique_ptr<CellInfo> create_ecp5_cell(Context *ctx, IdString type, std::string name) {
     static int auto_idx = 0;
     std::unique_ptr<CellInfo> new_cell = std::unique_ptr<CellInfo>(new CellInfo());
     if (name.empty()) {
diff --git a/ecp5/family.cmake b/ecp5/family.cmake
index f4d0bf87..97e5d66b 100644
--- a/ecp5/family.cmake
+++ b/ecp5/family.cmake
@@ -1,5 +1,5 @@
 
-set(devices 45k)
+set(devices 25k 45k 85k)
 
 if (NOT DEFINED TRELLIS_ROOT)
     message(FATAL_ERROR "you must define TRELLIS_ROOT using -DTRELLIS_ROOT=/path/to/prjtrellis for ECP5 support")