caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[xc7] Make clg400 the default package (Zybo)

Browse Source
This commit is contained in:
Eddie Hung 2018-11-03 15:02:09 -07:00
parent ac919421f0
commit 4239e3668a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xc7/arch.cc
View File

@ -276,7 +276,7 @@ Arch::Arch(ArchArgs args) : args(args)
{ {
torc::common::DirectoryTree directoryTree("/opt/torc/src/torc"); torc::common::DirectoryTree directoryTree("/opt/torc/src/torc");
if (args.type == ArchArgs::Z020) { 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 { } else {
log_error("Unsupported XC7 chip type.\n"); log_error("Unsupported XC7 chip type.\n");
} }

8
xc7/main.cc
View File

@ -94,16 +94,16 @@ std::unique_ptr<Context> Xc7CommandHandler::createContext()
{ {
if (vm.count("z020")) { if (vm.count("z020")) {
chipArgs.type = ArchArgs::Z020; chipArgs.type = ArchArgs::Z020;
chipArgs.package = "clg484"; chipArgs.package = "clg400";
} }
if (chipArgs.type == ArchArgs::NONE) { if (chipArgs.type == ArchArgs::NONE) {
chipArgs.type = ArchArgs::Z020; chipArgs.type = ArchArgs::Z020;
chipArgs.package = "clg484"; chipArgs.package = "clg400";
} }
// if (vm.count("package")) if (vm.count("package"))
// chipArgs.package = vm["package"].as<std::string>(); chipArgs.package = vm["package"].as<std::string>();
return std::unique_ptr<Context>(new Context(chipArgs)); return std::unique_ptr<Context>(new Context(chipArgs));
} }

2
xc7/xdl.cc
View File

@ -35,7 +35,7 @@ NEXTPNR_NAMESPACE_BEGIN
void write_xdl(const Context *ctx, std::ostream &out) void write_xdl(const Context *ctx, std::ostream &out)
{ {
XdlExporter exporter(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::unordered_map<int32_t,InstanceSharedPtr> site_to_instance;
std::vector<std::pair<std::string,std::string>> lut_inputs; std::vector<std::pair<std::string,std::string>> lut_inputs;