[PULL 06/10] Remove the qemu-system-microblazeel target from the build

[Thomas Huth <thuth@redhat.com>]

From: Thomas Huth <thuth@redhat.com>

It's been deprecated since two releases, so it should be fine to
remove this now. Users can use the qemu-system-microblaze binary
instead that can handle both endiannesses now.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20260226084608.11251-5-thuth@redhat.com>
---
 MAINTAINERS                                      |  4 ++--
 docs/about/deprecated.rst                        | 13 -------------
 docs/about/removed-features.rst                  | 14 ++++++++++++++
 configs/devices/microblazeel-softmmu/default.mak |  6 ------
 configs/targets/microblazeel-softmmu.mak         |  6 ------
 qapi/machine.json                                |  2 +-
 system/arch_init.h                               |  3 +--
 7 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 configs/devices/microblazeel-softmmu/default.mak
 delete mode 100644 configs/targets/microblazeel-softmmu.mak

diff --git a/MAINTAINERS b/MAINTAINERS
index 606b16762cf..23f3480582a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -286,7 +286,7 @@ F: target/microblaze/
 F: hw/microblaze/
 F: disas/microblaze.c
 F: tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh
-F: tests/functional/microblaze*/meson.build
+F: tests/functional/microblaze/
 
 MIPS TCG CPUs
 M: Philippe Mathieu-Daudé <philmd@linaro.org>
@@ -1424,7 +1424,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 S: Maintained
 F: hw/microblaze/petalogix_s3adsp1800_mmu.c
 F: include/hw/char/xilinx_uartlite.h
-F: tests/functional/microblaze*/test_s3adsp1800.py
+F: tests/functional/microblaze/test_s3adsp1800.py
 
 petalogix_ml605
 M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 1d5c4f3707c..d0ce914d858 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -301,19 +301,6 @@ please write a mail to the qemu-devel mailing list). If you just want to
 boot a Cortex-A15 or Cortex-A9 Linux, use the ``virt`` machine instead.
 
 
-System emulator binaries
-------------------------
-
-``qemu-system-microblazeel`` (since 10.1)
-'''''''''''''''''''''''''''''''''''''''''
-
-The ``qemu-system-microblaze`` binary can emulate little-endian machines
-now, too, so the separate binary ``qemu-system-microblazeel`` (with the
-``el`` suffix) for little-endian targets is not required anymore. The
-``petalogix-s3adsp1800`` machine can now be switched to little endian by
-setting its ``endianness`` property to ``little``.
-
-
 Backend options
 ---------------
 
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index 41bec8b8e38..c6ee20ff620 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1277,6 +1277,20 @@ The 'pvrdma' device and the whole RDMA subsystem have been removed.
 
 SD physical layer specification v2.00 supersedes the v1.10 one.
 
+
+System emulator binaries
+------------------------
+
+``qemu-system-microblazeel`` (removed in 11.0)
+''''''''''''''''''''''''''''''''''''''''''''''
+
+The ``qemu-system-microblaze`` binary can emulate little-endian machines
+now, too, so the separate binary ``qemu-system-microblazeel`` (with the
+``el`` suffix) for little-endian targets is not required anymore. The
+``petalogix-s3adsp1800`` machine can now be switched to little endian by
+setting its ``endianness`` property to ``little``.
+
+
 Related binaries
 ----------------
 
diff --git a/configs/devices/microblazeel-softmmu/default.mak b/configs/devices/microblazeel-softmmu/default.mak
deleted file mode 100644
index 4c1086435bf..00000000000
--- a/configs/devices/microblazeel-softmmu/default.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default configuration for microblazeel-softmmu
-
-# Boards are selected by default, uncomment to keep out of the build.
-# CONFIG_PETALOGIX_S3ADSP1800=n
-# CONFIG_PETALOGIX_ML605=n
-# CONFIG_XLNX_ZYNQMP_PMU=n
diff --git a/configs/targets/microblazeel-softmmu.mak b/configs/targets/microblazeel-softmmu.mak
deleted file mode 100644
index 52feb957b48..00000000000
--- a/configs/targets/microblazeel-softmmu.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=microblaze
-# needed by boot.c
-TARGET_NEED_FDT=y
-TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
-TARGET_LONG_BITS=32
-TARGET_NOT_USING_LEGACY_LDST_PHYS_API=y
diff --git a/qapi/machine.json b/qapi/machine.json
index ef8575b6eb9..685e4e29b87 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -38,7 +38,7 @@
 ##
 { 'enum' : 'SysEmuTarget',
   'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'hexagon', 'hppa', 'i386',
-             'loongarch64', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64',
+             'loongarch64', 'm68k', 'microblaze', 'mips', 'mips64',
              'mips64el', 'mipsel', 'or1k', 'ppc',
              'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4',
              'sh4eb', 'sparc', 'sparc64', 'tricore',
diff --git a/system/arch_init.h b/system/arch_init.h
index bb17d18a2b5..0c2b1f3a5d0 100644
--- a/system/arch_init.h
+++ b/system/arch_init.h
@@ -10,8 +10,7 @@ enum {
     QEMU_ARCH_I386 =        (1UL << SYS_EMU_TARGET_I386) |
                             (1UL << SYS_EMU_TARGET_X86_64),
     QEMU_ARCH_M68K =        (1UL << SYS_EMU_TARGET_M68K),
-    QEMU_ARCH_MICROBLAZE =  (1UL << SYS_EMU_TARGET_MICROBLAZE) |
-                            (1UL << SYS_EMU_TARGET_MICROBLAZEEL),
+    QEMU_ARCH_MICROBLAZE =  (1UL << SYS_EMU_TARGET_MICROBLAZE),
     QEMU_ARCH_MIPS =        (1UL << SYS_EMU_TARGET_MIPS) |
                             (1UL << SYS_EMU_TARGET_MIPSEL) |
                             (1UL << SYS_EMU_TARGET_MIPS64) |
-- 
2.53.0