From 05d8ef6a4362605da8b33274b68ee35defd684e0 Mon Sep 17 00:00:00 2001
From: Patrick Urban <patrick.urban@web.de>
Date: Wed, 15 Oct 2025 17:35:20 +0200
Subject: [PATCH] gmpack: revert `CFG_RECONFIG` and `CFG_CPE_CFG` separation

---
 libgm/src/Bitstream.cpp | 5 +----
 libgm/tools/gmpack.cpp  | 5 -----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/libgm/src/Bitstream.cpp b/libgm/src/Bitstream.cpp
index 57c6694..ca00741 100644
--- a/libgm/src/Bitstream.cpp
+++ b/libgm/src/Bitstream.cpp
@@ -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()) {
diff --git a/libgm/tools/gmpack.cpp b/libgm/tools/gmpack.cpp
index 6fe93b1..2cd41f7 100644
--- a/libgm/tools/gmpack.cpp
+++ b/libgm/tools/gmpack.cpp
@@ -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>());
     }