Skip to content

Commit 01d01ed

Browse files
committed
system: Remove support for CRIS target
We are about to remove the CRIS target, so remove the sysemu part. This remove the CRIS 'none' machine. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Thomas Huth <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Acked-by: Edgar E. Iglesias <[email protected]> Message-ID: <[email protected]>
1 parent 5b0b67d commit 01d01ed

File tree

6 files changed

+3
-6
lines changed

6 files changed

+3
-6
lines changed

.gitlab-ci.d/buildtest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ build-without-defaults:
675675
--disable-pie
676676
--disable-qom-cast-debug
677677
--disable-strip
678-
TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu
678+
TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu
679679
mips-softmmu mips64-softmmu mipsel-softmmu mips64el-softmmu
680680
ppc-softmmu s390x-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu
681681
sparc64-softmmu tricore-softmmu xtensa-softmmu xtensaeb-softmmu

.gitlab-ci.d/crossbuild-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
- ccache --zero-stats
2121
- ../configure --enable-werror --disable-docs --enable-fdt=system
2222
--disable-user $QEMU_CONFIGURE_OPTS $EXTRA_CONFIGURE_OPTS
23-
--target-list-exclude="arm-softmmu cris-softmmu
23+
--target-list-exclude="arm-softmmu
2424
i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
2525
mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
2626
sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS"

configs/devices/cris-softmmu/default.mak

Lines changed: 0 additions & 1 deletion
This file was deleted.

configs/targets/cris-softmmu.mak

Lines changed: 0 additions & 1 deletion
This file was deleted.

include/sysemu/arch_init.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ enum {
66
QEMU_ARCH_ALL = -1,
77
QEMU_ARCH_ALPHA = (1 << 0),
88
QEMU_ARCH_ARM = (1 << 1),
9-
QEMU_ARCH_CRIS = (1 << 2),
109
QEMU_ARCH_I386 = (1 << 3),
1110
QEMU_ARCH_M68K = (1 << 4),
1211
QEMU_ARCH_MICROBLAZE = (1 << 6),

qapi/machine.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# Since: 3.0
3434
##
3535
{ 'enum' : 'SysEmuTarget',
36-
'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'cris', 'hppa', 'i386',
36+
'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'hppa', 'i386',
3737
'loongarch64', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64',
3838
'mips64el', 'mipsel', 'or1k', 'ppc',
3939
'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4',

0 commit comments

Comments
 (0)