diff --git a/Config.in.legacy b/Config.in.legacy index ead9ceaa08..90606ebd4b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2026.05" +config BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL + bool "qemu target microblazeel removed" + select BR2_PACKAGE_QEMU_TARGET_MICROBLAZE + select BR2_LEGACY + help + Version 11.0.0 of qemu folded microblazeel support into + the microblaze target. + config BR2_KERNEL_HEADERS_6_19 bool "kernel headers version 6.19.x are no longer supported" select BR2_LEGACY diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 0b16c8c284..2a6aa288d3 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -2,13 +2,9 @@ config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET bool # Only tested on these architectures default y if BR2_aarch64 - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 - default y if BR2_i386 - default y if BR2_mips - default y if BR2_mipsel default y if BR2_powerpc64 default y if BR2_powerpc64le - default y if BR2_riscv + default y if BR2_RISCV_64 default y if BR2_s390x default y if BR2_x86_64 @@ -223,12 +219,6 @@ config BR2_PACKAGE_QEMU_TARGET_MICROBLAZE help Xilinx MicroBlaze soft processor. -config BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL - bool "microblazeel" - select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM - help - Xilinx MicroBlaze EL soft processor. - config BR2_PACKAGE_QEMU_TARGET_MIPS bool "mips" help diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index f8e750225f..7c7325a6ce 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 9e30ad1b8b9f7b4463001582d1ab297f39cfccea5d08540c0ca6d6672785883a qemu-10.2.0.tar.xz +sha256 c04ca36012653f32d11c674d370cf52a710e7d3f18c2d8b63e4932052a4854d6 qemu-11.0.0.tar.xz sha256 dd3ce02338c3a48abb6ba59b48809f7108a8bd242cb0cc8be90daafa30707c28 COPYING sha256 31c90ce76b6f5aab90a205851e71d5c27e31c0aa3d7017a4383b98a6fe3f1faa COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index b7007e3b98..2199db38cf 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 10.2.0 +QEMU_VERSION = 11.0.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_SELINUX_MODULES = qemu virt @@ -28,6 +28,8 @@ QEMU_DEPENDENCIES = \ host-pkgconf \ host-python3 \ host-python-distlib \ + host-python-setuptools \ + host-python-wheel \ libglib2 \ zlib @@ -70,7 +72,6 @@ QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-softmmu -QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-softmmu @@ -107,7 +108,6 @@ QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-linux-user -QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-linux-user @@ -318,6 +318,7 @@ define QEMU_CONFIGURE_CMDS --disable-curses \ --disable-dbus-display \ --disable-docs \ + --disable-download \ --disable-dsound \ --disable-hvf \ --disable-jack \ @@ -345,7 +346,6 @@ define QEMU_CONFIGURE_CMDS --disable-xen \ --enable-attr \ --enable-vhost-net \ - --disable-download \ --disable-hexagon-idef-parser \ $(QEMU_OPTS) endef @@ -372,6 +372,8 @@ HOST_QEMU_DEPENDENCIES = \ host-pkgconf \ host-python3 \ host-python-distlib \ + host-python-setuptools \ + host-python-wheel \ host-slirp \ host-zlib @@ -386,6 +388,7 @@ HOST_QEMU_DEPENDENCIES = \ # x86_64 x86_64 # m68k m68k # microblaze microblaze +# microblazeel microblaze # mips mips # mipsel mipsel # mips64 mips64 @@ -416,6 +419,10 @@ endif ifeq ($(HOST_QEMU_ARCH),i686) HOST_QEMU_ARCH = i386 endif +ifeq ($(HOST_QEMU_ARCH),microblazeel) +# since v11.0.0, microblazeel emulation is provided by the microblaze target +HOST_QEMU_ARCH = microblaze +endif ifeq ($(HOST_QEMU_ARCH),powerpc) HOST_QEMU_ARCH = ppc endif @@ -508,6 +515,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-curl \ --disable-dbus-display \ --disable-docs \ + --disable-download \ --disable-dsound \ --disable-jack \ --disable-libssh \