mirror of https://github.com/xemu-project/xemu.git
hw/arm: Remove 'connex' and 'verdex' machines
The connex and verdex machines have been deprecated since 9.0 and so can be removed for the 9.2 release. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-id: 20240903160751.4100218-10-peter.maydell@linaro.org
This commit is contained in:
parent
6af139c385
commit
a2ccff4d2b
|
@ -750,14 +750,6 @@ S: Maintained
|
||||||
F: hw/rtc/goldfish_rtc.c
|
F: hw/rtc/goldfish_rtc.c
|
||||||
F: include/hw/rtc/goldfish_rtc.h
|
F: include/hw/rtc/goldfish_rtc.h
|
||||||
|
|
||||||
Gumstix
|
|
||||||
M: Peter Maydell <peter.maydell@linaro.org>
|
|
||||||
R: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
||||||
L: qemu-arm@nongnu.org
|
|
||||||
S: Odd Fixes
|
|
||||||
F: hw/arm/gumstix.c
|
|
||||||
F: docs/system/arm/gumstix.rst
|
|
||||||
|
|
||||||
i.MX25 PDK
|
i.MX25 PDK
|
||||||
M: Peter Maydell <peter.maydell@linaro.org>
|
M: Peter Maydell <peter.maydell@linaro.org>
|
||||||
R: Jean-Christophe Dubois <jcd@tribudubois.net>
|
R: Jean-Christophe Dubois <jcd@tribudubois.net>
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
# CONFIG_VEXPRESS=n
|
# CONFIG_VEXPRESS=n
|
||||||
# CONFIG_ZYNQ=n
|
# CONFIG_ZYNQ=n
|
||||||
# CONFIG_MAINSTONE=n
|
# CONFIG_MAINSTONE=n
|
||||||
# CONFIG_GUMSTIX=n
|
|
||||||
# CONFIG_Z2=n
|
# CONFIG_Z2=n
|
||||||
# CONFIG_NPCM7XX=n
|
# CONFIG_NPCM7XX=n
|
||||||
# CONFIG_COLLIE=n
|
# CONFIG_COLLIE=n
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
Gumstix Connex and Verdex (``connex``, ``verdex``)
|
|
||||||
==================================================
|
|
||||||
|
|
||||||
These machines model the Gumstix Connex and Verdex boards.
|
|
||||||
The Connex has a PXA255 CPU and the Verdex has a PXA270.
|
|
||||||
|
|
||||||
Implemented devices:
|
|
||||||
|
|
||||||
* NOR flash
|
|
||||||
* SMC91C111 ethernet
|
|
||||||
* Interrupt controller
|
|
||||||
* DMA
|
|
||||||
* Timer
|
|
||||||
* GPIO
|
|
||||||
* MMC/SD card
|
|
||||||
* Fast infra-red communications port (FIR)
|
|
||||||
* LCD controller
|
|
||||||
* Synchronous serial ports (SPI)
|
|
||||||
* PCMCIA interface
|
|
||||||
* I2C
|
|
||||||
* I2S
|
|
|
@ -91,7 +91,6 @@ undocumented; you can get a complete list by running
|
||||||
arm/cubieboard
|
arm/cubieboard
|
||||||
arm/emcraft-sf2
|
arm/emcraft-sf2
|
||||||
arm/musicpal
|
arm/musicpal
|
||||||
arm/gumstix
|
|
||||||
arm/mainstone
|
arm/mainstone
|
||||||
arm/kzm
|
arm/kzm
|
||||||
arm/nseries
|
arm/nseries
|
||||||
|
|
|
@ -184,14 +184,6 @@ config PXA2XX
|
||||||
select USB_OHCI_SYSBUS
|
select USB_OHCI_SYSBUS
|
||||||
select PCMCIA
|
select PCMCIA
|
||||||
|
|
||||||
config GUMSTIX
|
|
||||||
bool
|
|
||||||
default y
|
|
||||||
depends on TCG && ARM
|
|
||||||
select PFLASH_CFI01
|
|
||||||
select SMC91C111
|
|
||||||
select PXA2XX
|
|
||||||
|
|
||||||
config Z2
|
config Z2
|
||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
|
|
141
hw/arm/gumstix.c
141
hw/arm/gumstix.c
|
@ -1,141 +0,0 @@
|
||||||
/*
|
|
||||||
* Gumstix Platforms
|
|
||||||
*
|
|
||||||
* Copyright (c) 2007 by Thorsten Zitterell <info@bitmux.org>
|
|
||||||
*
|
|
||||||
* Code based on spitz platform by Andrzej Zaborowski <balrog@zabor.org>
|
|
||||||
*
|
|
||||||
* This code is licensed under the GNU GPL v2.
|
|
||||||
*
|
|
||||||
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
||||||
* GNU GPL, version 2 or (at your option) any later version.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Example usage:
|
|
||||||
*
|
|
||||||
* connex:
|
|
||||||
* =======
|
|
||||||
* create image:
|
|
||||||
* # dd of=flash bs=1k count=16k if=/dev/zero
|
|
||||||
* # dd of=flash bs=1k conv=notrunc if=u-boot.bin
|
|
||||||
* # dd of=flash bs=1k conv=notrunc seek=256 if=rootfs.arm_nofpu.jffs2
|
|
||||||
* start it:
|
|
||||||
* # qemu-system-arm -M connex -pflash flash -monitor null -nographic
|
|
||||||
*
|
|
||||||
* verdex:
|
|
||||||
* =======
|
|
||||||
* create image:
|
|
||||||
* # dd of=flash bs=1k count=32k if=/dev/zero
|
|
||||||
* # dd of=flash bs=1k conv=notrunc if=u-boot.bin
|
|
||||||
* # dd of=flash bs=1k conv=notrunc seek=256 if=rootfs.arm_nofpu.jffs2
|
|
||||||
* # dd of=flash bs=1k conv=notrunc seek=31744 if=uImage
|
|
||||||
* start it:
|
|
||||||
* # qemu-system-arm -M verdex -pflash flash -monitor null -nographic -m 289
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
|
||||||
#include "qemu/units.h"
|
|
||||||
#include "qemu/error-report.h"
|
|
||||||
#include "hw/arm/pxa.h"
|
|
||||||
#include "net/net.h"
|
|
||||||
#include "hw/block/flash.h"
|
|
||||||
#include "hw/net/smc91c111.h"
|
|
||||||
#include "hw/boards.h"
|
|
||||||
#include "exec/address-spaces.h"
|
|
||||||
#include "sysemu/qtest.h"
|
|
||||||
|
|
||||||
#define CONNEX_FLASH_SIZE (16 * MiB)
|
|
||||||
#define CONNEX_RAM_SIZE (64 * MiB)
|
|
||||||
|
|
||||||
#define VERDEX_FLASH_SIZE (32 * MiB)
|
|
||||||
#define VERDEX_RAM_SIZE (256 * MiB)
|
|
||||||
|
|
||||||
#define FLASH_SECTOR_SIZE (128 * KiB)
|
|
||||||
|
|
||||||
static void connex_init(MachineState *machine)
|
|
||||||
{
|
|
||||||
PXA2xxState *cpu;
|
|
||||||
DriveInfo *dinfo;
|
|
||||||
|
|
||||||
cpu = pxa255_init(CONNEX_RAM_SIZE);
|
|
||||||
|
|
||||||
dinfo = drive_get(IF_PFLASH, 0, 0);
|
|
||||||
if (!dinfo && !qtest_enabled()) {
|
|
||||||
error_report("A flash image must be given with the "
|
|
||||||
"'pflash' parameter");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Numonyx RC28F128J3F75 */
|
|
||||||
pflash_cfi01_register(0x00000000, "connext.rom", CONNEX_FLASH_SIZE,
|
|
||||||
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
||||||
FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0);
|
|
||||||
|
|
||||||
/* Interrupt line of NIC is connected to GPIO line 36 */
|
|
||||||
smc91c111_init(0x04000300, qdev_get_gpio_in(cpu->gpio, 36));
|
|
||||||
}
|
|
||||||
|
|
||||||
static void verdex_init(MachineState *machine)
|
|
||||||
{
|
|
||||||
PXA2xxState *cpu;
|
|
||||||
DriveInfo *dinfo;
|
|
||||||
|
|
||||||
cpu = pxa270_init(VERDEX_RAM_SIZE, machine->cpu_type);
|
|
||||||
|
|
||||||
dinfo = drive_get(IF_PFLASH, 0, 0);
|
|
||||||
if (!dinfo && !qtest_enabled()) {
|
|
||||||
error_report("A flash image must be given with the "
|
|
||||||
"'pflash' parameter");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Micron RC28F256P30TFA */
|
|
||||||
pflash_cfi01_register(0x00000000, "verdex.rom", VERDEX_FLASH_SIZE,
|
|
||||||
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
||||||
FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0);
|
|
||||||
|
|
||||||
/* Interrupt line of NIC is connected to GPIO line 99 */
|
|
||||||
smc91c111_init(0x04000300, qdev_get_gpio_in(cpu->gpio, 99));
|
|
||||||
}
|
|
||||||
|
|
||||||
static void connex_class_init(ObjectClass *oc, void *data)
|
|
||||||
{
|
|
||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
|
||||||
|
|
||||||
mc->desc = "Gumstix Connex (PXA255)";
|
|
||||||
mc->init = connex_init;
|
|
||||||
mc->ignore_memory_transaction_failures = true;
|
|
||||||
mc->deprecation_reason = "machine is old and unmaintained";
|
|
||||||
}
|
|
||||||
|
|
||||||
static const TypeInfo connex_type = {
|
|
||||||
.name = MACHINE_TYPE_NAME("connex"),
|
|
||||||
.parent = TYPE_MACHINE,
|
|
||||||
.class_init = connex_class_init,
|
|
||||||
};
|
|
||||||
|
|
||||||
static void verdex_class_init(ObjectClass *oc, void *data)
|
|
||||||
{
|
|
||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
|
||||||
|
|
||||||
mc->desc = "Gumstix Verdex Pro XL6P COMs (PXA270)";
|
|
||||||
mc->init = verdex_init;
|
|
||||||
mc->ignore_memory_transaction_failures = true;
|
|
||||||
mc->deprecation_reason = "machine is old and unmaintained";
|
|
||||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c0");
|
|
||||||
}
|
|
||||||
|
|
||||||
static const TypeInfo verdex_type = {
|
|
||||||
.name = MACHINE_TYPE_NAME("verdex"),
|
|
||||||
.parent = TYPE_MACHINE,
|
|
||||||
.class_init = verdex_class_init,
|
|
||||||
};
|
|
||||||
|
|
||||||
static void gumstix_machine_init(void)
|
|
||||||
{
|
|
||||||
type_register_static(&connex_type);
|
|
||||||
type_register_static(&verdex_type);
|
|
||||||
}
|
|
||||||
|
|
||||||
type_init(gumstix_machine_init)
|
|
|
@ -67,7 +67,6 @@ arm_ss.add(when: 'CONFIG_XEN', if_true: files(
|
||||||
system_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c'))
|
system_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c'))
|
||||||
system_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c'))
|
system_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c'))
|
||||||
system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
|
system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
|
||||||
system_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c'))
|
|
||||||
system_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c'))
|
system_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c'))
|
||||||
system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap2.c'))
|
system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap2.c'))
|
||||||
system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c'))
|
system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c'))
|
||||||
|
|
Loading…
Reference in New Issue