From 4239e3668a3778f94918d12968f3594e7a351f37 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Sat, 3 Nov 2018 15:02:09 -0700
Subject: [PATCH] [xc7] Make clg400 the default package (Zybo)

---
 xc7/arch.cc | 2 +-
 xc7/main.cc | 8 ++++----
 xc7/xdl.cc  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xc7/arch.cc b/xc7/arch.cc
index cc755254..9cc635ea 100644
--- a/xc7/arch.cc
+++ b/xc7/arch.cc
@@ -276,7 +276,7 @@ Arch::Arch(ArchArgs args) : args(args)
 {
     torc::common::DirectoryTree directoryTree("/opt/torc/src/torc");
     if (args.type == ArchArgs::Z020) {
-        torc_info = std::unique_ptr<TorcInfo>(new TorcInfo(this, "xc7z020", "clg484"));
+        torc_info = std::unique_ptr<TorcInfo>(new TorcInfo(this, "xc7z020", args.package));
     } else {
         log_error("Unsupported XC7 chip type.\n");
     }
diff --git a/xc7/main.cc b/xc7/main.cc
index ec73c940..01e736c8 100644
--- a/xc7/main.cc
+++ b/xc7/main.cc
@@ -94,16 +94,16 @@ std::unique_ptr<Context> Xc7CommandHandler::createContext()
 {
     if (vm.count("z020")) {
         chipArgs.type = ArchArgs::Z020;
-        chipArgs.package = "clg484";
+        chipArgs.package = "clg400";
     }
 
     if (chipArgs.type == ArchArgs::NONE) {
         chipArgs.type = ArchArgs::Z020;
-        chipArgs.package = "clg484";
+        chipArgs.package = "clg400";
     }
 
-//    if (vm.count("package"))
-//        chipArgs.package = vm["package"].as<std::string>();
+    if (vm.count("package"))
+        chipArgs.package = vm["package"].as<std::string>();
 
     return std::unique_ptr<Context>(new Context(chipArgs));
 }
diff --git a/xc7/xdl.cc b/xc7/xdl.cc
index a82d568d..21a1ccf5 100644
--- a/xc7/xdl.cc
+++ b/xc7/xdl.cc
@@ -35,7 +35,7 @@ NEXTPNR_NAMESPACE_BEGIN
 void write_xdl(const Context *ctx, std::ostream &out)
 {
     XdlExporter exporter(out);
-    auto designPtr = Factory::newDesignPtr("name", torc_info->ddb->getDeviceName(), "clg484", "-1", "");
+    auto designPtr = Factory::newDesignPtr("name", torc_info->ddb->getDeviceName(), ctx->args.package, "-1", "");
 
     std::unordered_map<int32_t,InstanceSharedPtr> site_to_instance;
     std::vector<std::pair<std::string,std::string>> lut_inputs;