[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/14] hw/ppc/mac.h: Move PROM and KERNEL defines to board code
From: |
Mark Cave-Ayland |
Subject: |
[PULL 10/14] hw/ppc/mac.h: Move PROM and KERNEL defines to board code |
Date: |
Mon, 31 Oct 2022 20:14:31 +0000 |
From: BALATON Zoltan <balaton@eik.bme.hu>
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>
Message-Id:
<5fa693334adf166d23931c81d81ada4e3441ed7d.1666957578.git.balaton@eik.bme.hu>
Signed-off-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.2
- [PULL 00/14] qemu-macppc queue 20221031, Mark Cave-Ayland, 2022/10/31
- [PULL 01/14] mac_newworld: Drop some variables, Mark Cave-Ayland, 2022/10/31
- [PULL 02/14] mac_oldworld: Drop some more variables, Mark Cave-Ayland, 2022/10/31
- [PULL 04/14] mac_{old|new}world: Avoid else branch by setting default value, Mark Cave-Ayland, 2022/10/31
- [PULL 05/14] mac_newworld: Clean up creation of Uninorth devices, Mark Cave-Ayland, 2022/10/31
- [PULL 03/14] mac_{old|new}world: Set tbfreq at declaration, Mark Cave-Ayland, 2022/10/31
- [PULL 06/14] mac_{old|new}world: Reduce number of QOM casts, Mark Cave-Ayland, 2022/10/31
- [PULL 07/14] hw/ppc/mac.h: Move newworld specific parts out from shared header, Mark Cave-Ayland, 2022/10/31
- [PULL 08/14] hw/ppc/mac.h: Move macio specific parts out from shared header, Mark Cave-Ayland, 2022/10/31
- [PULL 09/14] hw/ppc/mac.h: Move grackle-pcihost type declaration out to a header, Mark Cave-Ayland, 2022/10/31
- [PULL 10/14] hw/ppc/mac.h: Move PROM and KERNEL defines to board code,
Mark Cave-Ayland <=
- [PULL 12/14] mac_nvram: Use NVRAM_SIZE constant, Mark Cave-Ayland, 2022/10/31
- [PULL 11/14] hw/ppc/mac.h: Rename to include/hw/nvram/mac_nvram.h, Mark Cave-Ayland, 2022/10/31
- [PULL 13/14] mac_{old|new}world: Code style fix adding missing braces to if-s, Mark Cave-Ayland, 2022/10/31
- [PULL 14/14] mac_newworld: Turn CORE99_VIA_CONFIG defines into an enum, Mark Cave-Ayland, 2022/10/31