From patchwork Mon Dec 14 20:34:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 11973025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58044C2BB40 for ; Mon, 14 Dec 2020 20:37:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AC153222BB for ; Mon, 14 Dec 2020 20:37:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AC153222BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koubE-0005vm-Rk for qemu-devel@archiver.kernel.org; Mon, 14 Dec 2020 15:37:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kouXn-0000jN-OL; Mon, 14 Dec 2020 15:34:07 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:42384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kouXl-0007rn-Pq; Mon, 14 Dec 2020 15:34:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1607978046; x=1639514046; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2TG0lw4zTTE9K+65mX3o2BSFxGx4t2P6pw44PD0QoRY=; b=Ls0ffJINFs4mDkcQk7SP3gqjnIC5MVJashTcCNEOOIHTLkTcZXCkYayd Vv5L5Ei2iVdxpqUalUT0AiNeqMh4L0TAvnQPMHOuEuiftMuR/+HI2pqJD eeMo1h6Fa13mmRuPyKTdFu/PEMDO3Nc+t6nEfXImSvMXZPiRnB5K65zyN Zq4RteFd4i6dy5GJuVLymnUf76GF5cr7eZ7PEGxv/A+p6Bn5p+ClsKbmX 17WzpvhlhiI7dUW+ihEDCC4Ad2wv3f06mW95ZSl9CxfQU/LRYWNcG/g+G HttzomOb/i01dlfRAXhDiWZSXCUay7zta43kALq13UbC4bO33Yc3SK0ru Q==; IronPort-SDR: /iRqPOKceRA8AuGWQ7omYeKDrkmJhQAh6cLn4566LeiRIg3DAjKtWsrYjFg65Tl0Tq/4zUwXSv reE4+VOWsoKCMbf4Jq5W/VUi/stM551VXmtBO5T5011/n9h5pQBE/LfsTpbe2dsnq3W0OsnHR8 sHERBDB3xn7TWZamP8mQH39AejUqBrnaSMUo3dEoqgAWCviWyX60mCTRpnlpBgx2n1PwPgFRWC 6LMm78dEl1LBEwrPek09mZ8MtSyk3GRI3Xa3dfaP2A0dSXSlFMotK1vq3e5OxrU5vJi8Xj698C 8kk= X-IronPort-AV: E=Sophos;i="5.78,420,1599494400"; d="scan'208";a="156338105" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 15 Dec 2020 04:34:05 +0800 IronPort-SDR: 3TPL6pfZXeuQmPh38eHJENhJczXpnOZKld5vk6VWUGpOP5SfdOlcqTqWldQVj5d/DRmUGae7p8 96t3AIR5wbx2eproXT+rvkdDQACGftcBflizdTDwHkNiwtVqLz6BeWNgdQYW69rLWdUhqYZ+lB jIjHYfADJ2P3saLPuOI9eeTfk2UptmH54E51GEZytRzwS58FDfsP2Tzye3B10BWRUSswbEA3Wg 8vq6NF6B7rgPuqqDQjUAyKspOwDpD+Cc80hhJMhiLaM1uvFPb6/S6BvZTbWCcGjbYJtpfz1rNZ KEP7rebz7rGj1JgYfPshaRJn Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2020 12:17:48 -0800 IronPort-SDR: OorjMNRskJIA6tzYYOKBj9dxvjSG2/MSrjvzXKBUVMGnY0ZKd62KxsSByKFC6QODivqARHGGgo 4kq0qYcZ0PY+rptyEpQEGqBKUl8JLhhijea3KpJUIOH6eKXl22rjmg4U/PdP6wr5OhPpt6yRKZ 9Y1Rf4l5RkI/elgtMd3C4qyW+oMtJCDJiKtnoob3OIA0vZ7wEOu3j0UTYvXKCdtCwXY3n0mUDE sWgZuX0vd7mD52qLAf25kuTAcluNm5EGGHdQlsAjxMDh7Sav3LhAU2BTMHxdkOvPqng4hnRYzv Tvg= WDCIronportException: Internal Received: from cnf006900.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.62.52]) by uls-op-cesaip02.wdc.com with ESMTP; 14 Dec 2020 12:34:04 -0800 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v3 03/15] riscv: spike: Remove target macro conditionals Date: Mon, 14 Dec 2020 12:34:04 -0800 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.154.45; envelope-from=prvs=61015ee87=alistair.francis@wdc.com; helo=esa6.hgst.iphmx.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair.francis@wdc.com, bmeng.cn@gmail.com, palmer@dabbelt.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- include/hw/riscv/spike.h | 6 ------ hw/riscv/spike.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h index cddeca2e77..cdd1a13011 100644 --- a/include/hw/riscv/spike.h +++ b/include/hw/riscv/spike.h @@ -47,10 +47,4 @@ enum { SPIKE_DRAM }; -#if defined(TARGET_RISCV32) -#define SPIKE_V1_10_0_CPU TYPE_RISCV_CPU_BASE32 -#elif defined(TARGET_RISCV64) -#define SPIKE_V1_10_0_CPU TYPE_RISCV_CPU_BASE64 -#endif - #endif diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index facac6e7d2..29f07f47b1 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -317,7 +317,7 @@ static void spike_machine_class_init(ObjectClass *oc, void *data) mc->init = spike_board_init; mc->max_cpus = SPIKE_CPUS_MAX; mc->is_default = true; - mc->default_cpu_type = SPIKE_V1_10_0_CPU; + mc->default_cpu_type = TYPE_RISCV_CPU_BASE; mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props; mc->get_default_cpu_node_id = riscv_numa_get_default_cpu_node_id;