Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into...

[mirror_qemu.git] / target / xtensa / core-dc232b.c

diff --git a/target/xtensa/core-dc232b.c b/target/xtensa/core-dc232b.c
index bb8ed4197f565274c8a4eb0642858bc9e8322654..9aba2667e331f1d3c4beeae7874c395d6ba35bc3 100644 (file)
--- a/target/xtensa/core-dc232b.c
+++ b/target/xtensa/core-dc232b.c
@@ -27,23 +27,25 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
-#include "exec/gdbstub.h"
+#include "gdbstub/helpers.h"
 #include "qemu/host-utils.h"
+#include "qemu/timer.h"
 
 #include "core-dc232b/core-isa.h"
 #include "overlay_tool.h"
 
+#define xtensa_modules xtensa_modules_dc232b
+#include "core-dc232b/xtensa-modules.c.inc"
+
 static XtensaConfig dc232b __attribute__((unused)) = {
     .name = "dc232b",
     .gdb_regmap = {
-        .num_regs = 120,
-        .num_core_regs = 52,
         .reg = {
-#include "core-dc232b/gdb-config.c"
+#include "core-dc232b/gdb-config.c.inc"
         }
     },
-    .clock_freq_khz = 10000,
+    .isa_internal = &xtensa_modules,
+    .clock_freq_khz = (NANOSECONDS_PER_SECOND / 64) / 1000,
     DEFAULT_SECTIONS
 };