mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xlnx-ep108: Rename to ZCU102

Browse Source 
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 <alistair.francis@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Alistair Francis 2017-09-14 18:43:17 +01:00 committed by Peter Maydell
parent 351e527a61
commit aff3f0f150
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/Makefile.objs
View File

@ -13,7 +13,7 @@ obj-y += omap1.o omap2.o strongarm.o
obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o
obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-zcu102.o
obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o
obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o

30
hw/arm/xlnx-ep108.c → hw/arm/xlnx-zcu102.c
View File

@ -1,5 +1,5 @@
/* /*
* Xilinx ZynqMP EP108 board * Xilinx ZynqMP ZCU102 board
* *
* Copyright (C) 2015 Xilinx Inc * Copyright (C) 2015 Xilinx Inc
* Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com> * Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com>
@ -25,16 +25,16 @@
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "qemu/log.h" #include "qemu/log.h"
typedef struct XlnxEP108 { typedef struct XlnxZCU102 {
XlnxZynqMPState soc; XlnxZynqMPState soc;
MemoryRegion ddr_ram; MemoryRegion ddr_ram;
} XlnxEP108; } XlnxZCU102;
static struct arm_boot_info xlnx_ep108_binfo; static struct arm_boot_info xlnx_zcu102_binfo;
static void xlnx_ep108_init(MachineState *machine) static void xlnx_zcu102_init(MachineState *machine)
{ {
XlnxEP108 *s = g_new0(XlnxEP108, 1); XlnxZCU102 *s = g_new0(XlnxZCU102, 1);
int i; int i;
uint64_t ram_size = machine->ram_size; uint64_t ram_size = machine->ram_size;
@ -47,7 +47,7 @@ static void xlnx_ep108_init(MachineState *machine)
} }
if (ram_size < 0x08000000) { 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); ram_size);
} }
@ -108,18 +108,18 @@ static void xlnx_ep108_init(MachineState *machine)
/* TODO create and connect IDE devices for ide_drive_get() */ /* TODO create and connect IDE devices for ide_drive_get() */
xlnx_ep108_binfo.ram_size = ram_size; xlnx_zcu102_binfo.ram_size = ram_size;
xlnx_ep108_binfo.kernel_filename = machine->kernel_filename; xlnx_zcu102_binfo.kernel_filename = machine->kernel_filename;
xlnx_ep108_binfo.kernel_cmdline = machine->kernel_cmdline; xlnx_zcu102_binfo.kernel_cmdline = machine->kernel_cmdline;
xlnx_ep108_binfo.initrd_filename = machine->initrd_filename; xlnx_zcu102_binfo.initrd_filename = machine->initrd_filename;
xlnx_ep108_binfo.loader_start = 0; xlnx_zcu102_binfo.loader_start = 0;
arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_ep108_binfo); arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_zcu102_binfo);
} }
static void xlnx_ep108_machine_init(MachineClass *mc) static void xlnx_ep108_machine_init(MachineClass *mc)
{ {
mc->desc = "Xilinx ZynqMP EP108 board"; mc->desc = "Xilinx ZynqMP EP108 board";
mc->init = xlnx_ep108_init; mc->init = xlnx_zcu102_init;
mc->block_default_type = IF_IDE; mc->block_default_type = IF_IDE;
mc->units_per_default_bus = 1; mc->units_per_default_bus = 1;
mc->ignore_memory_transaction_failures = true; mc->ignore_memory_transaction_failures = true;
@ -130,7 +130,7 @@ DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init)
static void xlnx_zcu102_machine_init(MachineClass *mc) static void xlnx_zcu102_machine_init(MachineClass *mc)
{ {
mc->desc = "Xilinx ZynqMP ZCU102 board"; mc->desc = "Xilinx ZynqMP ZCU102 board";
mc->init = xlnx_ep108_init; mc->init = xlnx_zcu102_init;
mc->block_default_type = IF_IDE; mc->block_default_type = IF_IDE;
mc->units_per_default_bus = 1; mc->units_per_default_bus = 1;
mc->ignore_memory_transaction_failures = true; mc->ignore_memory_transaction_failures = true;