Signed-off-by: Thomas Huth <th...@redhat.com>
---
MAINTAINERS | 2 +-
disas/cris.c | 4 +---
{target-cris => target/cris}/Makefile.objs | 0
{target-cris => target/cris}/cpu-qom.h | 0
{target-cris => target/cris}/cpu.c | 0
{target-cris => target/cris}/cpu.h | 0
{target-cris => target/cris}/crisv10-decode.h | 0
{target-cris => target/cris}/crisv32-decode.h | 0
{target-cris => target/cris}/gdbstub.c | 0
{target-cris => target/cris}/helper.c | 0
{target-cris => target/cris}/helper.h | 0
{target-cris => target/cris}/machine.c | 0
{target-cris => target/cris}/mmu.c | 0
{target-cris => target/cris}/mmu.h | 0
{target-cris => target/cris}/op_helper.c | 0
{target-cris => target/cris}/opcode-cris.h | 0
{target-cris => target/cris}/translate.c | 0
{target-cris => target/cris}/translate_v10.c | 0
18 files changed, 2 insertions(+), 4 deletions(-)
rename {target-cris => target/cris}/Makefile.objs (100%)
rename {target-cris => target/cris}/cpu-qom.h (100%)
rename {target-cris => target/cris}/cpu.c (100%)
rename {target-cris => target/cris}/cpu.h (100%)
rename {target-cris => target/cris}/crisv10-decode.h (100%)
rename {target-cris => target/cris}/crisv32-decode.h (100%)
rename {target-cris => target/cris}/gdbstub.c (100%)
rename {target-cris => target/cris}/helper.c (100%)
rename {target-cris => target/cris}/helper.h (100%)
rename {target-cris => target/cris}/machine.c (100%)
rename {target-cris => target/cris}/mmu.c (100%)
rename {target-cris => target/cris}/mmu.h (100%)
rename {target-cris => target/cris}/op_helper.c (100%)
rename {target-cris => target/cris}/opcode-cris.h (100%)
rename {target-cris => target/cris}/translate.c (100%)
rename {target-cris => target/cris}/translate_v10.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index f8959d8..ccb841f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -126,7 +126,7 @@ F: disas/libvixl/
CRIS
M: Edgar E. Iglesias <edgar.igles...@gmail.com>
S: Maintained
-F: target-cris/
+F: target/cris/
F: hw/cris/
F: include/hw/cris/
F: tests/tcg/cris/
diff --git a/disas/cris.c b/disas/cris.c
index 7f35bc0..08161d1 100644
--- a/disas/cris.c
+++ b/disas/cris.c
@@ -21,9 +21,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "disas/bfd.h"
-//#include "sysdep.h"
-#include "target-cris/opcode-cris.h"
-//#include "libiberty.h"
+#include "target/cris/opcode-cris.h"
#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1)
== 0)
diff --git a/target-cris/Makefile.objs b/target/cris/Makefile.objs
similarity index 100%
rename from target-cris/Makefile.objs
rename to target/cris/Makefile.objs
diff --git a/target-cris/cpu-qom.h b/target/cris/cpu-qom.h
similarity index 100%
rename from target-cris/cpu-qom.h
rename to target/cris/cpu-qom.h
diff --git a/target-cris/cpu.c b/target/cris/cpu.c
similarity index 100%
rename from target-cris/cpu.c
rename to target/cris/cpu.c
diff --git a/target-cris/cpu.h b/target/cris/cpu.h
similarity index 100%
rename from target-cris/cpu.h
rename to target/cris/cpu.h
diff --git a/target-cris/crisv10-decode.h b/target/cris/crisv10-decode.h
similarity index 100%
rename from target-cris/crisv10-decode.h
rename to target/cris/crisv10-decode.h
diff --git a/target-cris/crisv32-decode.h b/target/cris/crisv32-decode.h
similarity index 100%
rename from target-cris/crisv32-decode.h
rename to target/cris/crisv32-decode.h
diff --git a/target-cris/gdbstub.c b/target/cris/gdbstub.c
similarity index 100%
rename from target-cris/gdbstub.c
rename to target/cris/gdbstub.c
diff --git a/target-cris/helper.c b/target/cris/helper.c
similarity index 100%
rename from target-cris/helper.c
rename to target/cris/helper.c
diff --git a/target-cris/helper.h b/target/cris/helper.h
similarity index 100%
rename from target-cris/helper.h
rename to target/cris/helper.h
diff --git a/target-cris/machine.c b/target/cris/machine.c
similarity index 100%
rename from target-cris/machine.c
rename to target/cris/machine.c
diff --git a/target-cris/mmu.c b/target/cris/mmu.c
similarity index 100%
rename from target-cris/mmu.c
rename to target/cris/mmu.c
diff --git a/target-cris/mmu.h b/target/cris/mmu.h
similarity index 100%
rename from target-cris/mmu.h
rename to target/cris/mmu.h
diff --git a/target-cris/op_helper.c b/target/cris/op_helper.c
similarity index 100%
rename from target-cris/op_helper.c
rename to target/cris/op_helper.c
diff --git a/target-cris/opcode-cris.h b/target/cris/opcode-cris.h
similarity index 100%
rename from target-cris/opcode-cris.h
rename to target/cris/opcode-cris.h
diff --git a/target-cris/translate.c b/target/cris/translate.c
similarity index 100%
rename from target-cris/translate.c
rename to target/cris/translate.c
diff --git a/target-cris/translate_v10.c b/target/cris/translate_v10.c
similarity index 100%
rename from target-cris/translate_v10.c
rename to target/cris/translate_v10.c
--
1.8.3.1
