update default ship configuration

diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java
index 01edcfe..491ca45 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/Fpga.java
+++ b/src/edu/berkeley/fleet/fpga/Fpga.java
@@ -65,17 +65,11 @@ public class Fpga extends FleetTwoFleet {
         this.top = top;
         debugShip = createShip("Debug",     "debug");
 
-        int LANES = 5;
-        //int LANES = 2;
+        createShip("Memory",      "memory1");
+        //createShip("Memory",    "memory2");
+        //createShip("Memory",    "memory3");
 
-        createShip("Memory",            "memory1");
-
-        if (LANES>2) {
-            //createShip("Memory",    "memory2");
-            //createShip("Memory",    "memory3");
-        }
-
-        for(int i=0; i<LANES; i++)
+        for(int i=0; i<5; i++)
             createShip("Alu",       "alu"+i);
 
         for(int i=0; i<2; i++)
@@ -84,16 +78,9 @@ public class Fpga extends FleetTwoFleet {
         for(int i=0; i<13; i++)
             createShip("Counter",  "counter"+i);
 
-        /*
-        if (LANES < 15) {
-            createShip("CarrySaveAdder",  "csa1");
-            createShip("Rotator",         "rotator");
-            createShip("Lut3",            "lut");
-        }
-        */
-
-        if (LANES<=1)
-            createShip("Fifo",      "fifo_extra");
+        createShip("CarrySaveAdder",  "csa1");
+        createShip("Rotator",         "rotator");
+        createShip("Lut3",            "lut");
 
         createShip("DRAM",    "dram");
         //createShip("DDR2",    "ddr2");