[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 10/19] hw/ppc/mac.h: Move PROM and KERNEL defines to board cod
From: |
BALATON Zoltan |
Subject: |
[PATCH v6 10/19] hw/ppc/mac.h: Move PROM and KERNEL defines to board code |
Date: |
Fri, 28 Oct 2022 13:56:26 +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 873c9f5cb4..c75c59fe3e 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 47a1abf248..ae8e0ff30a 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -58,10 +58,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.6
- [PATCH v6 04/19] mac_{old|new}world: Avoid else branch by setting default value, (continued)
- [PATCH v6 04/19] mac_{old|new}world: Avoid else branch by setting default value, BALATON Zoltan, 2022/10/28
- [PATCH v6 06/19] mac_{old|new}world: Reduce number of QOM casts, BALATON Zoltan, 2022/10/28
- [PATCH v6 05/19] mac_newworld: Clean up creation of Uninorth devices, BALATON Zoltan, 2022/10/28
- [PATCH v6 14/19] mac_newworld: Turn CORE99_VIA_CONFIG defines into an enum, BALATON Zoltan, 2022/10/28
- [PATCH v6 16/19] mac_newworld: Deprecate mac99 with G5 CPU, BALATON Zoltan, 2022/10/28
- [PATCH v6 18/19] mac_newworld: Document deprecation, BALATON Zoltan, 2022/10/28
- [PATCH v6 09/19] hw/ppc/mac.h: Move grackle-pcihost type declaration out to a header, BALATON Zoltan, 2022/10/28
- [PATCH v6 12/19] mac_nvram: Use NVRAM_SIZE constant, BALATON Zoltan, 2022/10/28
- [PATCH v6 10/19] hw/ppc/mac.h: Move PROM and KERNEL defines to board code,
BALATON Zoltan <=
- [PATCH v6 15/19] mac_newworld: Add machine types for different mac99 configs, BALATON Zoltan, 2022/10/28
- [PATCH v6 19/19] mac_{old, new}world: Pass MacOS VGA NDRV in card ROM instead of fw_cfg, BALATON Zoltan, 2022/10/28
- [PATCH v6 17/19] mac_newworld: Deprecate mac99 "via" option, BALATON Zoltan, 2022/10/28
- [PATCH v6 07/19] hw/ppc/mac.h: Move newworld specific parts out from shared header, BALATON Zoltan, 2022/10/28
- [PATCH v6 11/19] hw/ppc/mac.h: Rename to include/hw/nvram/mac_nvram.h, BALATON Zoltan, 2022/10/28
- [PATCH v6 13/19] mac_{old|new}world: Code style fix adding missing braces to if-s, BALATON Zoltan, 2022/10/28
- [PATCH v6 08/19] hw/ppc/mac.h: Move macio specific parts out from shared header, BALATON Zoltan, 2022/10/28
- Re: [PATCH v6 00/19] Misc ppc/mac machines clean up, Mark Cave-Ayland, 2022/10/30