From nobody Sat Oct 25 08:57:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520369518829846.2031630847171; Tue, 6 Mar 2018 12:51:58 -0800 (PST) Received: from localhost ([::1]:58090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJYz-0002VZ-W2 for importer@patchew.org; Tue, 06 Mar 2018 15:51:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJSi-00062d-Jb for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etJSg-0003NR-4t for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:28 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:36224) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etJSf-0003Mw-Ja for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:26 -0500 Received: by mail-pf0-x242.google.com with SMTP id 68so9251641pfx.3 for ; Tue, 06 Mar 2018 12:45:25 -0800 (PST) Received: from localhost.localdomain (125-237-39-90-fibre.bb.spark.co.nz. [125.237.39.90]) by smtp.gmail.com with ESMTPSA id y6sm39123791pfg.71.2018.03.06.12.45.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 12:45:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ske1/wLnFoMKR3d9VBTHLrBUUWQoivp0/hb11tadxH0=; b=Zh8kJGRf6/SZEj9gExehnO5sdXKDhf6898suPVdEnNrrqBV+pdE6jSOpiUSTa+8bSx D20SgHABDUU0bFCU0/bgqDsDvn1/fBQXGKTcWoR7ZBQqXyBPYl1r96RDoqPnzgkMx+I0 moBoSYuk96QbaU5D1NSCWNqcc9XreK1x4ur2lcWfH4pqQEdDzQ7gJaGicu5Y0N+x9hPV a8Gjq31FRAnrDkOcIdYzzJ4WVls8G1l2FrYlEWj+pKPti16ymvGhF9g3YZHy16Bi40np hOiSWrm+vAp74gIpz6P6b5JcgXqIOe8zJqhFicA8059EHWeOjeB26b4Gf3P0IwuOwGTI U/3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ske1/wLnFoMKR3d9VBTHLrBUUWQoivp0/hb11tadxH0=; b=epvBI2hOWrxqkS9BwcA82p1UzkakkZUTpfHwDccO4+fMfbkSYgLH0bYwq/ZW87y13E iDCOESs1zh5ozY90I6m5FqTZoY0GThpD4om9sy7w9c365FI1+8h5LlAYAmOXXXDXgaHT ykNYRIyd6VKToK9C8buHYyDX3TYdzf5oBaVQ/6XrCKlAdCM0TfEYdimztMg0/BQYWrm1 g71i5YD2w0Wk7nNwqmC5Cm7YBYn4Mwu5dNscqLKSS6aBQcV+dHsCs0K0wlY6Tn6MLiWq RXhZAPGJUm1E5bHZ/RPL6722hEB0wTKGKq3p79rxILfOsTZqNNAbA89oBb4lBbLuN0iP uBpQ== X-Gm-Message-State: APf1xPCSx5Jz8MsE4E5+MhcPrJPitjYDZvU+4qYpPlF9jF+W0Z72jH/y KtWNbT8Gm+dSsjQ0Bz1sws/LJtiawKs= X-Google-Smtp-Source: AG47ELspBlQBb/n9AjjPdTAR5BVIEhb6TzJM/rWLnjNFH4ujIJtVY1VMx9aLnpYDrpe6hJ18crIdSA== X-Received: by 10.99.122.70 with SMTP id j6mr14715169pgn.17.1520369124549; Tue, 06 Mar 2018 12:45:24 -0800 (PST) From: Michael Clark To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 09:43:39 +1300 Message-Id: <1520369037-37977-5-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1520369037-37977-1-git-send-email-mjc@sifive.com> References: <1520369037-37977-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH v1 04/22] RISC-V: Use ROM base address and size from memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bastian Koppelmann , Michael Clark , Palmer Dabbelt , Sagar Karandikar , RISC-V Patches map Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Another case of replaceing hard coded constants, this time referring to the definition in the virt machine's memmap. Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt --- hw/riscv/virt.c | 4 ++-- include/hw/riscv/virt.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 0055439..0d101fc 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -338,11 +338,11 @@ static void riscv_virt_board_init(MachineState *machi= ne) }; =20 /* copy in the reset vector */ - copy_le32_to_phys(ROM_BASE, reset_vec, sizeof(reset_vec)); + copy_le32_to_phys(memmap[VIRT_MROM].base, reset_vec, sizeof(reset_vec)= ); =20 /* copy in the device tree */ qemu_fdt_dumpdtb(s->fdt, s->fdt_size); - cpu_physical_memory_write(ROM_BASE + sizeof(reset_vec), + cpu_physical_memory_write(memmap[VIRT_MROM].base + sizeof(reset_vec), s->fdt, s->fdt_size); =20 /* create PLIC hart topology configuration string */ diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 2fbe808..655e85d 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -23,8 +23,6 @@ #define VIRT(obj) \ OBJECT_CHECK(RISCVVirtState, (obj), TYPE_RISCV_VIRT_BOARD) =20 -enum { ROM_BASE =3D 0x1000 }; - typedef struct { /*< private >*/ SysBusDevice parent_obj; --=20 2.7.0