From patchwork Wed Sep 11 12:13:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 827401 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp762728wrc; Wed, 11 Sep 2024 05:17:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUlQo0m8/qiqls1NHdhkSEVQSISy2d9dKeO0R6XFwGlqlPRT8SsYtfVidnXoj10X4H8v7Fd7g==@linaro.org X-Google-Smtp-Source: AGHT+IGEkk7ddfkOJ1f6PYpdoJfk8Muixx8UT1FbeMrjYeR48/9sBel2H43jdU0Pw7ctDcrdRqwE X-Received: by 2002:a05:6102:374c:b0:49c:1060:78b5 with SMTP id ada2fe7eead31-49c10607e7dmr6370198137.4.1726057066653; Wed, 11 Sep 2024 05:17:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726057066; cv=none; d=google.com; s=arc-20240605; b=Tru/qf4SaPPZewTM1AhsUVygykMTPDYf0UvVUaJytIRm+cnzSXIeSM7FvbfTD/1ftD KThMkPJY38Hm07aDlWgElXslzpJMQYaZynpkOq3D3G0mO4HZEEVoGiBa+2pdKckCNiVK vSvJPtKOHumIs78sz/Kq2vkJAKBrcnmJ+91k2H0k7sL+cx/QzbRP0Lx1fQQbYEHQ22pW 0UdCiHA0sznRqFrGlOgu4zpZCqh6lof8qG1HuokSPGYvduRbaesE4lKUjpG5rwGXncR1 Z/5vVMZrzEQN0Fy8zDCpB3r0AL1MnF+WSjOQF1vkkxMqpoEcTAzDPwht7oOXlvdH8Vf2 u1kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VcxrQmlncOi9RQ8/5TKjDLqLTGvXZJ41pNBta9PgccY=; fh=3cYl7IL8YQAQ5gPuEGdfjVaJRpw2AREjJCEfnPLD1fY=; b=HOrGvpb/q2ZD9/kRi2czmDZI5Me6khZPRjgWfSmZOrryam0ZqyoSxvsvphqfFmBLaB f+ILLAn+aZuUiv7kHF1RqNWJdkjYQhfIQjrOCBoAgoBNpwIL8m7wKOmYJwPxdfCCtFRI ZexozGqpwV8e0u9rpcGdkumqWYsILCh7MBRFICmFjs1aowaONX5v5u1lpK1skiWAeSVz OYKUmyP/75zWaGF21ocSqTrSWLPXBeXJXC6/kTkBignFzeMNgZgpkLP0luRnRk4sCmLN mOiS7XleRSLDcz1fj4FW+6KCVqt+aaKTO1/KYXOqdm9Ce0zpOmh8XSUA1Achvg3dMDUi /xZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IxTTCfLn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-49c16db0222si936121137.361.2024.09.11.05.17.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Sep 2024 05:17:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IxTTCfLn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soMGz-0005lN-Ou; Wed, 11 Sep 2024 08:16:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soMGx-0005QM-43 for qemu-devel@nongnu.org; Wed, 11 Sep 2024 08:16:35 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soMGs-0007TJ-6Y for qemu-devel@nongnu.org; Wed, 11 Sep 2024 08:16:34 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-42cacabd2e0so17395715e9.3 for ; Wed, 11 Sep 2024 05:16:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726056988; x=1726661788; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VcxrQmlncOi9RQ8/5TKjDLqLTGvXZJ41pNBta9PgccY=; b=IxTTCfLnAKD1VYNRu1leNmIE1nXiWNF1tm5gVC9nEkKGLxdmooOKhReteHOhxuNZ+g HM9qQ0MkHl0wIvBH92ayb2+7exMm1cFeg2BK9VvDwERQNiewthuvgq9w4diBoFzhOmNi vpGeYvJqP4kBsa8ZeTSUezMBpkVxiz5m+ORix3VnCJcpl8eRbfPIPvt2FZLBvNPJhTaB dgODBUL+qpQA6RopycjNe6eSpbNrCptqgB1GrNtCBjA7+sQSFKh4ldvpldlEC0AfsTP/ IivI246qNv8mPlzlahNqRYSSe3qYu1MaNSSEB5l717xIgxJcoDt8t5cuJyn8C8ItFFqP rOSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726056988; x=1726661788; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VcxrQmlncOi9RQ8/5TKjDLqLTGvXZJ41pNBta9PgccY=; b=NXADyHMLx2pGqAue1EqCBtIT417XPUp290yamhcvRJIhlmHWlFATFqZSO3Dd5DhHAU iNvvVeYFn3Lm05fdc8NDKLNWwcVUy+o/lhy1196wVvydiUgIsDhtf0A5WMW/1riQeYHJ VjmqyCxsVJQ10pycGpjnfohVL1hUd8XsZLlkBvAdcF/4IyqZT/iypUL7Yq/Ar7I2UPkt U9pCqTL2SEDwhK0ngKJkr4hvmvih1JViqCmdNFPni/xr5VMA2WZuA3lBcI9a4VriFjty 64nRvuiA30AEUtGVlLo6jv8mdOMgjt4HfFuOVX4xPwdl00PpWOd/TrnyFp4eMxjWB+hx friw== X-Gm-Message-State: AOJu0YziQtS16FeddgNL3oHxv5EaEYhdzut5XAWR6wEVFbeKEPOxsNg2 oc4NZ3TizbZxTRXcuqp59Mw15EgUoqQsEsvT4hMkniibxaQ/QCpLA3FGlQ8uDNNKMBl0ICVPPln W X-Received: by 2002:a05:600c:5115:b0:42c:ba1f:5475 with SMTP id 5b1f17b1804b1-42ccd35aa7amr23701255e9.26.1726056987569; Wed, 11 Sep 2024 05:16:27 -0700 (PDT) Received: from m1x-phil.lan ([176.187.196.107]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb32678sm140205125e9.16.2024.09.11.05.16.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Sep 2024 05:16:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , "Edgar E . Iglesias" Subject: [PULL 18/56] system: Remove support for CRIS target Date: Wed, 11 Sep 2024 14:13:43 +0200 Message-ID: <20240911121422.52585-19-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240911121422.52585-1-philmd@linaro.org> References: <20240911121422.52585-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Acked-by: Edgar E. Iglesias Message-ID: <20240904143603.52934-13-philmd@linaro.org> --- configs/devices/cris-softmmu/default.mak | 1 - configs/targets/cris-softmmu.mak | 1 - qapi/machine.json | 2 +- include/sysemu/arch_init.h | 1 - .gitlab-ci.d/buildtest.yml | 2 +- .gitlab-ci.d/crossbuild-template.yml | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 configs/devices/cris-softmmu/default.mak delete mode 100644 configs/targets/cris-softmmu.mak diff --git a/configs/devices/cris-softmmu/default.mak b/configs/devices/cris-softmmu/default.mak deleted file mode 100644 index 3726699370..0000000000 --- a/configs/devices/cris-softmmu/default.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for cris-softmmu diff --git a/configs/targets/cris-softmmu.mak b/configs/targets/cris-softmmu.mak deleted file mode 100644 index e483c42066..0000000000 --- a/configs/targets/cris-softmmu.mak +++ /dev/null @@ -1 +0,0 @@ -TARGET_ARCH=cris diff --git a/qapi/machine.json b/qapi/machine.json index d4317435e7..63b84bc575 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -33,7 +33,7 @@ # Since: 3.0 ## { 'enum' : 'SysEmuTarget', - 'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'cris', 'hppa', 'i386', + 'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'hppa', 'i386', 'loongarch64', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64', 'mips64el', 'mipsel', 'or1k', 'ppc', 'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4', diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 8d041aa84e..5b1c1026f3 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -6,7 +6,6 @@ enum { QEMU_ARCH_ALL = -1, QEMU_ARCH_ALPHA = (1 << 0), QEMU_ARCH_ARM = (1 << 1), - QEMU_ARCH_CRIS = (1 << 2), QEMU_ARCH_I386 = (1 << 3), QEMU_ARCH_M68K = (1 << 4), QEMU_ARCH_MICROBLAZE = (1 << 6), diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index cfc51be08a..9e42d841e1 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -675,7 +675,7 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu + TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu mips-softmmu mips64-softmmu mipsel-softmmu mips64el-softmmu ppc-softmmu s390x-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu sparc64-softmmu tricore-softmmu xtensa-softmmu xtensaeb-softmmu diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index 18ec5b6253..2ce0432eb7 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -20,7 +20,7 @@ - ccache --zero-stats - ../configure --enable-werror --disable-docs --enable-fdt=system --disable-user $QEMU_CONFIGURE_OPTS $EXTRA_CONFIGURE_OPTS - --target-list-exclude="arm-softmmu cris-softmmu + --target-list-exclude="arm-softmmu i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS"