Remove cfg_arg_t from cfg_t

Argument parsing should be scoped to the code which constucts cfg_t

1 files changed, 18 insertions, 18 deletions

diff --git a/riscv/cfg.h b/riscv/cfg.h
index 422c1ae..82d902e 100644
--- a/riscv/cfg.h
+++ b/riscv/cfg.h
@@ -89,24 +89,24 @@ public:
       trigger_count(default_trigger_count)
   {}
 
-  cfg_arg_t<std::pair<reg_t, reg_t>> initrd_bounds;
-  cfg_arg_t<const char *>            bootargs;
-  cfg_arg_t<const char *>            isa;
-  cfg_arg_t<const char *>            priv;
-  cfg_arg_t<const char *>            varch;
-  bool                               misaligned;
-  endianness_t                       endianness;
-  reg_t                              pmpregions;
-  reg_t                              pmpgranularity;
-  cfg_arg_t<std::vector<mem_cfg_t>>  mem_layout;
-  std::optional<reg_t>               start_pc;
-  cfg_arg_t<std::vector<size_t>>     hartids;
-  bool                               explicit_hartids;
-  cfg_arg_t<bool>                    real_time_clint;
-  reg_t                              trigger_count;
-
-  size_t nprocs() const { return hartids().size(); }
-  size_t max_hartid() const { return hartids().back(); }
+  std::pair<reg_t, reg_t> initrd_bounds;
+  const char *            bootargs;
+  const char *            isa;
+  const char *            priv;
+  const char *            varch;
+  bool                    misaligned;
+  endianness_t            endianness;
+  reg_t                   pmpregions;
+  reg_t                   pmpgranularity;
+  std::vector<mem_cfg_t>  mem_layout;
+  std::optional<reg_t>    start_pc;
+  std::vector<size_t>     hartids;
+  bool                    explicit_hartids;
+  bool                    real_time_clint;
+  reg_t                   trigger_count;
+
+  size_t nprocs() const { return hartids.size(); }
+  size_t max_hartid() const { return hartids.back(); }
 };
 
 #endif