From patchwork Wed Sep 11 12:13:29 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: 1983930 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=WnV1x3cM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X3fgW5dvVz1y21 for ; Wed, 11 Sep 2024 22:16:23 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soMFo-0006SO-Ir; Wed, 11 Sep 2024 08:15:29 -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 1soMFQ-0005oP-LL for qemu-devel@nongnu.org; Wed, 11 Sep 2024 08:15:02 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soMFL-0007BC-Dr for qemu-devel@nongnu.org; Wed, 11 Sep 2024 08:14:58 -0400 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-5c3c30e663fso2326277a12.1 for ; Wed, 11 Sep 2024 05:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726056893; x=1726661693; 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=SHZtT0Mi6mfq4oAIqM+FpgWwIHkjDwma5fbBIgU2sjA=; b=WnV1x3cMoPwzGKEkNLT93C3ljGQ4/j/4kP+pGg+6kZnkWfSa/tKSI16Oyrisb/lkMT r2P6xQxK1uwcsBy/ZVqfyck7USsuP8JDTvKaaJdLqGJ6bFRwM2j2eHO0crhjZXSGoPyJ txnxHy5DRyX+UNPe//y3UJrFz+cDLUxEnFNSBil8osJFeytarY5he3ssMIG94QnlO3/G ywJlv5Fc5aBe8GuR+UGjgTcUMLmhKNXi4vRuENWBUYQUq+tjNBlIR3C7vKba+Odo5T/6 fdiMRY8m+2jHs00cjWzTk/xR0E4mxrQHLjJFi6dOqmihpD2z9dlLNvQhQOlqzx88ARnW T0nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726056893; x=1726661693; 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=SHZtT0Mi6mfq4oAIqM+FpgWwIHkjDwma5fbBIgU2sjA=; b=Ks6kwYJFFayIdWR9/fEef1t0KL7IQmlMGXhrbGNVbKMaiHPi2ynIcENKQdj0OTcppC JoNvY/G1GkKwQemXn35cOkQSuSsKO3sGWEbL3bBpJPYrnmwLxgWSzudktrjsKh6rMZU8 Wszdsc9GTQz0fj+xYhkmJOQ8O/ROKZK8i6m14lfupuVBNl6qE3+nQzaeCWsFfBhcMFmW 8O4MZqp5ObDk5FE77mCXqAVuOdfmEewoqG/AfYsNt/h39kbMO8e4x+TAjOEckk3Txn+P GvtnzHj5YWyB4iNIhL1T4bTB4pQjXZsXCR7eBXgWbt1SlXztSbGWwedDW2ZOwPIHwtbg 9kRQ== X-Gm-Message-State: AOJu0YwrZpjvkpbp5vbrnxLOg3R2TiwZJBSXA5Eb2QOQob8urUOxHCxC ordNt+GjIC2XSTTZ8QXQiAJWpmBfeq3gisEeDBOl00ihbR88LBRbdRu9Zs1GKIUJcTs5OET5v6h Q X-Google-Smtp-Source: AGHT+IG435OQch8dkX2kqi3xCqE7+ZfCaTp0s7Gk4gRiC1quouzVQO+nY/c61h6A3M6iuVhWU4WV8w== X-Received: by 2002:a05:6402:1d56:b0:5c0:aa23:e1c1 with SMTP id 4fb4d7f45d1cf-5c40bc24f9emr2553700a12.14.1726056892972; Wed, 11 Sep 2024 05:14:52 -0700 (PDT) Received: from m1x-phil.lan ([176.187.196.107]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd8cef8sm5394449a12.89.2024.09.11.05.14.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Sep 2024 05:14:52 -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?= , Peter Maydell , Yoshinori Sato Subject: [PULL 04/56] hw/sh4: Remove the deprecated SHIX machine Date: Wed, 11 Sep 2024 14:13:29 +0200 Message-ID: <20240911121422.52585-5-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::52e; envelope-from=philmd@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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, URIBL_SBL_A=0.1 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The SHIX machine is deprecated since v9.0 (commit 322b038c94 "target/sh4: Deprecate the shix machine"). Time to remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Reviewed-by: Yoshinori Sato Message-ID: <20240903153959.18392-2-philmd@linaro.org> --- MAINTAINERS | 7 +- docs/about/deprecated.rst | 6 -- docs/about/removed-features.rst | 5 ++ configs/devices/sh4-softmmu/default.mak | 1 - hw/sh4/shix.c | 86 ------------------------- hw/sh4/Kconfig | 7 -- hw/sh4/meson.build | 1 - 7 files changed, 6 insertions(+), 107 deletions(-) delete mode 100644 hw/sh4/shix.c diff --git a/MAINTAINERS b/MAINTAINERS index 0c1bc69828..ff5b3d1afd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1682,16 +1682,11 @@ F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h F: include/hw/timer/tmu012.h -Shix +TC58128 NAND EEPROM R: Yoshinori Sato R: Magnus Damm S: Odd Fixes F: hw/block/tc58128.c -F: hw/char/sh_serial.c -F: hw/sh4/shix.c -F: hw/intc/sh_intc.c -F: hw/timer/sh_timer.c -F: include/hw/sh4/sh_intc.h SPARC Machines -------------- diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 88f0f03786..2020542a6b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -232,12 +232,6 @@ These old machine types are quite neglected nowadays and thus might have various pitfalls with regards to live migration. Use a newer machine type instead. -``shix`` (since 9.0) -'''''''''''''''''''' - -The machine is no longer in existence and has been long unmaintained -in QEMU. This also holds for the TC51828 16MiB flash that it uses. - ``pseries-2.1`` up to ``pseries-2.12`` (since 9.0) '''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index fc7b28e637..9eaf864004 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -978,6 +978,11 @@ Nios II ``10m50-ghrd`` and ``nios2-generic-nommu`` machines (removed in 9.1) The Nios II architecture was orphan. +``shix`` (removed in 9.2) +''''''''''''''''''''''''' + +The machine was unmaintained. + linux-user mode CPUs -------------------- diff --git a/configs/devices/sh4-softmmu/default.mak b/configs/devices/sh4-softmmu/default.mak index c06a427053..aa821e4b60 100644 --- a/configs/devices/sh4-softmmu/default.mak +++ b/configs/devices/sh4-softmmu/default.mak @@ -7,4 +7,3 @@ # Boards are selected by default, uncomment to keep out of the build. # CONFIG_R2D=n -# CONFIG_SHIX=n diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c deleted file mode 100644 index eb3150b5bc..0000000000 --- a/hw/sh4/shix.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * SHIX 2.0 board description - * - * Copyright (c) 2005 Samuel Tardieu - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -/* - * Shix 2.0 board by Alexis Polti, described at - * https://web.archive.org/web/20070917001736/perso.enst.fr/~polti/realisations/shix20 - * - * More information in target/sh4/README.sh4 - */ -#include "qemu/osdep.h" -#include "qapi/error.h" -#include "cpu.h" -#include "hw/sh4/sh.h" -#include "sysemu/qtest.h" -#include "hw/boards.h" -#include "hw/loader.h" -#include "qemu/error-report.h" - -#define BIOS_FILENAME "shix_bios.bin" -#define BIOS_ADDRESS 0xA0000000 - -static void shix_init(MachineState *machine) -{ - int ret; - SuperHCPU *cpu; - struct SH7750State *s; - MemoryRegion *sysmem = get_system_memory(); - MemoryRegion *rom = g_new(MemoryRegion, 1); - MemoryRegion *sdram = g_new(MemoryRegion, 2); - const char *bios_name = machine->firmware ?: BIOS_FILENAME; - - cpu = SUPERH_CPU(cpu_create(machine->cpu_type)); - - /* Allocate memory space */ - memory_region_init_rom(rom, NULL, "shix.rom", 0x4000, &error_fatal); - memory_region_add_subregion(sysmem, 0x00000000, rom); - memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000, - &error_fatal); - memory_region_add_subregion(sysmem, 0x08000000, &sdram[0]); - memory_region_init_ram(&sdram[1], NULL, "shix.sdram2", 0x01000000, - &error_fatal); - memory_region_add_subregion(sysmem, 0x0c000000, &sdram[1]); - - /* Load BIOS in 0 (and access it through P2, 0xA0000000) */ - ret = load_image_targphys(bios_name, 0, 0x4000); - if (ret < 0 && !qtest_enabled()) { - error_report("Could not load SHIX bios '%s'", bios_name); - exit(1); - } - - /* Register peripherals */ - s = sh7750_init(cpu, sysmem); - /* XXXXX Check success */ - tc58128_init(s, "shix_linux_nand.bin", NULL); -} - -static void shix_machine_init(MachineClass *mc) -{ - mc->desc = "shix card"; - mc->init = shix_init; - mc->is_default = true; - mc->default_cpu_type = TYPE_SH7750R_CPU; - mc->deprecation_reason = "old and unmaintained"; -} - -DEFINE_MACHINE("shix", shix_machine_init) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 99a76a94c3..1660d292d5 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -13,13 +13,6 @@ config R2D select SH7750 select SH_PCI -config SHIX - bool - default y - depends on SH4 - select SH7750 - select TC58128 - config SH7750 bool select SH_INTC diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build index 70e814c3a2..7d27839fee 100644 --- a/hw/sh4/meson.build +++ b/hw/sh4/meson.build @@ -4,6 +4,5 @@ sh4_ss.add(when: 'CONFIG_SH7750', if_true: files( 'sh7750_regnames.c', )) sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c')) -sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c')) hw_arch += {'sh4': sh4_ss}