[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/13] hw/ppc/mac.h: Move PROM and KERNEL defines to board cod
From: |
BALATON Zoltan |
Subject: |
[PATCH v2 11/13] hw/ppc/mac.h: Move PROM and KERNEL defines to board code |
Date: |
Sun, 25 Sep 2022 14:38:18 +0200 (CEST) |
The PROM_FILENAME and KERNEL_* defines are used by mac_oldworld and
mac_newworld but they don't have to be identical so these could be
moved to the individual boards.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/ppc/mac.h | 4 ----
hw/ppc/mac_newworld.c | 4 ++++
hw/ppc/mac_oldworld.c | 7 ++++++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index fe77a6c6db..3e2df262ee 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -30,10 +30,6 @@
#include "hw/sysbus.h"
#define NVRAM_SIZE 0x2000
-#define PROM_FILENAME "openbios-ppc"
-
-#define KERNEL_LOAD_ADDR 0x01000000
-#define KERNEL_GAP 0x00100000
/* Mac NVRAM */
#define TYPE_MACIO_NVRAM "macio-nvram"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 32ab730600..94a8b72fb1 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -83,9 +83,13 @@
#define NDRV_VGA_FILENAME "qemu_vga.ndrv"
+#define PROM_FILENAME "openbios-ppc"
#define PROM_BASE 0xfff00000
#define PROM_SIZE (1 * MiB)
+#define KERNEL_LOAD_ADDR 0x01000000
+#define KERNEL_GAP 0x00100000
+
#define TYPE_CORE99_MACHINE MACHINE_TYPE_NAME("mac99")
typedef struct Core99MachineState Core99MachineState;
DECLARE_INSTANCE_CHECKER(Core99MachineState, CORE99_MACHINE,
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 1355d032ff..cfdee21cd2 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -57,10 +57,15 @@
#define NDRV_VGA_FILENAME "qemu_vga.ndrv"
-#define GRACKLE_BASE 0xfec00000
+#define PROM_FILENAME "openbios-ppc"
#define PROM_BASE 0xffc00000
#define PROM_SIZE (4 * MiB)
+#define KERNEL_LOAD_ADDR 0x01000000
+#define KERNEL_GAP 0x00100000
+
+#define GRACKLE_BASE 0xfec00000
+
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
Error **errp)
{
--
2.30.4
- [PATCH v2 04/13] mac_{old|new}world: Avoid else branch by setting default value, (continued)
- [PATCH v2 04/13] mac_{old|new}world: Avoid else branch by setting default value, BALATON Zoltan, 2022/09/25
- [PATCH v2 05/13] mac_oldworld: Do not open code sysbus_mmio_map(), BALATON Zoltan, 2022/09/25
- [PATCH v2 03/13] mac_{old|new}world: Set tbfreq at declaration, BALATON Zoltan, 2022/09/25
- [PATCH v2 06/13] mac_newworld: Simplify creation of Uninorth devices, BALATON Zoltan, 2022/09/25
- [PATCH v2 10/13] hw/ppc/mac.h: Move grackle-pcihost declaration out from shared header, BALATON Zoltan, 2022/09/25
- [PATCH v2 07/13] mac_{old|new}world: Reduce number of QOM casts, BALATON Zoltan, 2022/09/25
- [PATCH v2 11/13] hw/ppc/mac.h: Move PROM and KERNEL defines to board code,
BALATON Zoltan <=
- [PATCH v2 13/13] mac_nvram: Use NVRAM_SIZE constant, BALATON Zoltan, 2022/09/25
- [PATCH v2 08/13] hw/ppc/mac.h: Move newworld specific parts out from shared header, BALATON Zoltan, 2022/09/25
- [PATCH v2 12/13] hw/ppc/mac.h: Rename to include/hw/nvram/mac_nvram.h, BALATON Zoltan, 2022/09/25
- [PATCH v2 09/13] hw/ppc/mac.h: Move macio specific parts out from shared header, BALATON Zoltan, 2022/09/25
- Re: [PATCH v2 00/13] Misc ppc/mac machines clean up, Daniel Henrique Barboza, 2022/09/26