luke
/
prjpeppercorn
mirror of https://github.com/YosysHQ/prjpeppercorn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gmpack: revert `CFG_RECONFIG` and `CFG_CPE_CFG` separation

This commit is contained in:
Patrick Urban 2025-10-15 17:35:20 +02:00
parent c74d0860d3
commit 05d8ef6a43
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgm/src/Bitstream.cpp
View File

@ -1016,10 +1016,7 @@ Bitstream Bitstream::serialise_chip(const Chip &chip, const std::map<std::string
cfg_stat |= CFG_STOP | CFG_DONE;
if (options.count("reconfig")) {
cfg_stat |= CFG_RECONFIG;
}
if (options.count("cpeconfig")) {
cfg_stat |= CFG_CPE_CFG;
cfg_stat |= CFG_RECONFIG | CFG_CPE_CFG;
}
}
if (!die.is_serdes_cfg_empty()) {

5
libgm/tools/gmpack.cpp
View File

@ -41,7 +41,6 @@ int main(int argc, char *argv[])
options.add_options()("crcmode", po::value<std::string>(), "CRC error behaviour (check, ignore, unused)");
options.add_options()("spimode", po::value<std::string>(), "SPI Mode to use (single, dual, quad)");
options.add_options()("reconfig", "enable reconfiguration in bitstream");
options.add_options()("cpeconfig", "enable CPE configuration interface");
options.add_options()("bootaddr", po::value<int>(), "boot address for secondary bitstream");
po::positional_options_description pos;
options.add_options()("input", po::value<std::string>()->required(), "input textual configuration");
@ -101,10 +100,6 @@ int main(int argc, char *argv[])
bitopts["reconfig"] = "yes";
}
if (vm.count("cpeconfig")) {
bitopts["cpeconfig"] = "yes";
}
if (vm.count("bootaddr")) {
bitopts["bootaddr"] = std::to_string(vm["bootaddr"].as<int>());
}