[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 12/50] hppa: use new CONFIG_HPPA_B160L option instead of CONFI
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 12/50] hppa: use new CONFIG_HPPA_B160L option instead of CONFIG_DINO to build hppa machine |
Date: |
Wed, 4 May 2022 10:25:22 +0100 |
DINO refers to the GSC-PCI bridge device which will soon be handled separately,
however the QEMU HPPA machine is actually based upon the HPPA B160L as indicated
by the Linux kernel dmesg output when booted in qemu-system-hppa and the QEMU
MAINTAINERS file.
Update the machine configuration to use CONFIG_HPPA_B160L instead of CONFIG_DINO
and also update the machine description accordingly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
---
configs/devices/hppa-softmmu/default.mak | 2 +-
hw/hppa/Kconfig | 2 +-
hw/hppa/machine.c | 2 +-
hw/hppa/meson.build | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configs/devices/hppa-softmmu/default.mak
b/configs/devices/hppa-softmmu/default.mak
index b64c5eb3ff..b0364bb88f 100644
--- a/configs/devices/hppa-softmmu/default.mak
+++ b/configs/devices/hppa-softmmu/default.mak
@@ -6,4 +6,4 @@
# Boards:
#
-CONFIG_DINO=y
+CONFIG_HPPA_B160L=y
diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
index 22948db025..8d64ead217 100644
--- a/hw/hppa/Kconfig
+++ b/hw/hppa/Kconfig
@@ -1,4 +1,4 @@
-config DINO
+config HPPA_B160L
bool
imply PCI_DEVICES
imply E1000_PCI
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index f7595c0857..971d7ffcfe 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -366,7 +366,7 @@ static void hppa_nmi(NMIState *n, int cpu_index, Error
**errp)
static void machine_hppa_machine_init(MachineClass *mc)
{
- mc->desc = "HPPA generic machine";
+ mc->desc = "HPPA B160L machine";
mc->default_cpu_type = TYPE_HPPA_CPU;
mc->init = machine_hppa_init;
mc->reset = hppa_machine_reset;
diff --git a/hw/hppa/meson.build b/hw/hppa/meson.build
index 1deae83aee..32072bf204 100644
--- a/hw/hppa/meson.build
+++ b/hw/hppa/meson.build
@@ -1,4 +1,4 @@
hppa_ss = ss.source_set()
-hppa_ss.add(when: 'CONFIG_DINO', if_true: files('pci.c', 'machine.c',
'dino.c', 'lasi.c'))
+hppa_ss.add(when: 'CONFIG_HPPA_B160L', if_true: files('pci.c', 'machine.c',
'dino.c', 'lasi.c'))
hw_arch += {'hppa': hppa_ss}
--
2.20.1
- Re: [PATCH v2 10/50] dino: return PCIBus from dino_init() using qdev_get_child_bus(), (continued)
- [PATCH v2 17/50] dino: wire up serial IRQ using a qdev GPIO in machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 13/50] dino: change dino_init() to return the DINO device instead of PCIBus, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 15/50] dino.h: add defines for DINO IRQ numbers, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 18/50] dino: remove unused dino_set_timer_irq() IRQ handler, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 12/50] hppa: use new CONFIG_HPPA_B160L option instead of CONFIG_DINO to build hppa machine,
Mark Cave-Ayland <=
- [PATCH v2 16/50] dino: define IRQ inputs as qdev GPIOs, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 20/50] dino: use numerical constant for iar0 and iar1 reset values, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 19/50] hppa: move dino_init() from dino.c to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 21/50] dino: move DINO HPA constants from hppa_hardware.h to dino.h, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 23/50] lasi: checkpatch fixes, Mark Cave-Ayland, 2022/05/04