From nobody Thu Dec 18 17:52:00 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; 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 1505412532430988.6683971073829; Thu, 14 Sep 2017 11:08:52 -0700 (PDT) Received: from localhost ([::1]:49271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsYZH-0002a0-Mw for importer@patchew.org; Thu, 14 Sep 2017 14:08:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsYJb-000879-8o for qemu-devel@nongnu.org; Thu, 14 Sep 2017 13:52:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsYJZ-00080I-V3 for qemu-devel@nongnu.org; Thu, 14 Sep 2017 13:52:39 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37366) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsYJZ-0007vb-NL for qemu-devel@nongnu.org; Thu, 14 Sep 2017 13:52:37 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1dsYJS-0005qK-1V for qemu-devel@nongnu.org; Thu, 14 Sep 2017 18:52:30 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 14 Sep 2017 18:52:43 +0100 Message-Id: <1505411573-27848-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505411573-27848-1-git-send-email-peter.maydell@linaro.org> References: <1505411573-27848-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 08/18] xlnx-ep108: Rename to ZCU102 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Alistair Francis The EP108 is a early access development board. Now that silicon is in production people have access to the ZCU102. Let's rename the internal QEMU files and variables to use the ZCU102. There is no functional change here as the EP108 is still a valid board option. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Signed-off-by: Peter Maydell --- hw/arm/Makefile.objs | 2 +- hw/arm/{xlnx-ep108.c =3D> xlnx-zcu102.c} | 30 +++++++++++++++-------------= -- 2 files changed, 16 insertions(+), 16 deletions(-) rename hw/arm/{xlnx-ep108.c =3D> xlnx-zcu102.c} (85%) diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index a2e56ec..5ee6f7d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -13,7 +13,7 @@ obj-y +=3D omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) +=3D allwinner-a10.o cubieboard.o obj-$(CONFIG_RASPI) +=3D bcm2835_peripherals.o bcm2836.o raspi.o obj-$(CONFIG_STM32F205_SOC) +=3D stm32f205_soc.o -obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp.o xlnx-ep108.o +obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp.o xlnx-zcu102.o obj-$(CONFIG_FSL_IMX25) +=3D fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) +=3D fsl-imx31.o kzm.o obj-$(CONFIG_FSL_IMX6) +=3D fsl-imx6.o sabrelite.o diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-zcu102.c similarity index 85% rename from hw/arm/xlnx-ep108.c rename to hw/arm/xlnx-zcu102.c index c339cd4..e9702ed 100644 --- a/hw/arm/xlnx-ep108.c +++ b/hw/arm/xlnx-zcu102.c @@ -1,5 +1,5 @@ /* - * Xilinx ZynqMP EP108 board + * Xilinx ZynqMP ZCU102 board * * Copyright (C) 2015 Xilinx Inc * Written by Peter Crosthwaite @@ -25,16 +25,16 @@ #include "exec/address-spaces.h" #include "qemu/log.h" =20 -typedef struct XlnxEP108 { +typedef struct XlnxZCU102 { XlnxZynqMPState soc; MemoryRegion ddr_ram; -} XlnxEP108; +} XlnxZCU102; =20 -static struct arm_boot_info xlnx_ep108_binfo; +static struct arm_boot_info xlnx_zcu102_binfo; =20 -static void xlnx_ep108_init(MachineState *machine) +static void xlnx_zcu102_init(MachineState *machine) { - XlnxEP108 *s =3D g_new0(XlnxEP108, 1); + XlnxZCU102 *s =3D g_new0(XlnxZCU102, 1); int i; uint64_t ram_size =3D machine->ram_size; =20 @@ -47,7 +47,7 @@ static void xlnx_ep108_init(MachineState *machine) } =20 if (ram_size < 0x08000000) { - qemu_log("WARNING: RAM size 0x%" PRIx64 " is small for EP108", + qemu_log("WARNING: RAM size 0x%" PRIx64 " is small for ZCU102", ram_size); } =20 @@ -108,18 +108,18 @@ static void xlnx_ep108_init(MachineState *machine) =20 /* TODO create and connect IDE devices for ide_drive_get() */ =20 - xlnx_ep108_binfo.ram_size =3D ram_size; - xlnx_ep108_binfo.kernel_filename =3D machine->kernel_filename; - xlnx_ep108_binfo.kernel_cmdline =3D machine->kernel_cmdline; - xlnx_ep108_binfo.initrd_filename =3D machine->initrd_filename; - xlnx_ep108_binfo.loader_start =3D 0; - arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_ep108_binfo); + xlnx_zcu102_binfo.ram_size =3D ram_size; + xlnx_zcu102_binfo.kernel_filename =3D machine->kernel_filename; + xlnx_zcu102_binfo.kernel_cmdline =3D machine->kernel_cmdline; + xlnx_zcu102_binfo.initrd_filename =3D machine->initrd_filename; + xlnx_zcu102_binfo.loader_start =3D 0; + arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_zcu102_binfo); } =20 static void xlnx_ep108_machine_init(MachineClass *mc) { mc->desc =3D "Xilinx ZynqMP EP108 board"; - mc->init =3D xlnx_ep108_init; + mc->init =3D xlnx_zcu102_init; mc->block_default_type =3D IF_IDE; mc->units_per_default_bus =3D 1; mc->ignore_memory_transaction_failures =3D true; @@ -130,7 +130,7 @@ DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init) static void xlnx_zcu102_machine_init(MachineClass *mc) { mc->desc =3D "Xilinx ZynqMP ZCU102 board"; - mc->init =3D xlnx_ep108_init; + mc->init =3D xlnx_zcu102_init; mc->block_default_type =3D IF_IDE; mc->units_per_default_bus =3D 1; mc->ignore_memory_transaction_failures =3D true; --=20 2.7.4