From 8fa5da48d65dd5fee9b3473ee882f50a30655ccd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 21 Feb 2026 21:26:03 +0100 Subject: [PATCH] package/qemu: Remove CRIS support Buildroot commmit edfc67fb1a5f0fe67ba9de91e90b06a44902c231 bumped the package from 9.1.0 to 9.2.0 without removing support for CRIS which was removed upstream in version 9.2.0: https://gitlab.com/qemu-project/qemu/-/commit/01d01edc9fc4623e93118bc8cb8c69a46d707026 https://wiki.qemu.org/ChangeLog/9.2 "The CRIS target has been removed without replacement" Fixes: https://autobuild.buildroot.net/results/376/376ea96ddfc0f220bca8bd241614303747f61bd4/ Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain (cherry picked from commit 5e7e7c5a66f82cd6a96fc7925d99554592cca374) Signed-off-by: Thomas Perale --- Config.in.legacy | 8 ++++++++ package/qemu/Config.in | 5 ----- package/qemu/qemu.mk | 2 -- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f1e4fa0d99..bddafc66ce 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,14 @@ endif ############################################################################### +comment "Legacy options removed in 2025.02.12" + +config BR2_PACKAGE_QEMU_TARGET_CRIS + bool "qemu cris support has been removed" + select BR2_LEGACY + help + CRIS support has been removed since Qemu 9.2.0. + comment "Legacy options removed in 2025.02.11" config BR2_PACKAGE_DVDRW_TOOLS diff --git a/package/qemu/Config.in b/package/qemu/Config.in index ff7423bc4c..31f2981077 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -174,11 +174,6 @@ config BR2_PACKAGE_QEMU_TARGET_AVR help AVR 8-bit microcontroller architecture. -config BR2_PACKAGE_QEMU_TARGET_CRIS - bool "cris" - help - ETRAX CRIS microcontroller architecture. - config BR2_PACKAGE_QEMU_TARGET_HEXAGON bool "hexagon (linux-user, only)" depends on BR2_PACKAGE_QEMU_LINUX_USER diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 3a2f69ea3c..ae5f4ef5f7 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -52,7 +52,6 @@ QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AVR) += avr-softmmu -QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-softmmu @@ -89,7 +88,6 @@ QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64_BE) += aarch64_be-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARMEB) += armeb-linux-user -QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HEXAGON) += hexagon-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-linux-user QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-linux-user