mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/ppc/mac.h: Move PROM and KERNEL defines to board code

Browse Source 
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>
This commit is contained in:
BALATON Zoltan 2022-10-28 13:56:26 +02:00 committed by Mark Cave-Ayland
parent 87e5a4f8c2
commit 3d0031c17d
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/ppc/mac.h
View File

@ -30,10 +30,6 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#define NVRAM_SIZE 0x2000 #define NVRAM_SIZE 0x2000
#define PROM_FILENAME "openbios-ppc"
#define KERNEL_LOAD_ADDR 0x01000000
#define KERNEL_GAP 0x00100000
/* Mac NVRAM */ /* Mac NVRAM */
#define TYPE_MACIO_NVRAM "macio-nvram" #define TYPE_MACIO_NVRAM "macio-nvram"

4
hw/ppc/mac_newworld.c
View File

@ -83,9 +83,13 @@
#define NDRV_VGA_FILENAME "qemu_vga.ndrv" #define NDRV_VGA_FILENAME "qemu_vga.ndrv"
#define PROM_FILENAME "openbios-ppc"
#define PROM_BASE 0xfff00000 #define PROM_BASE 0xfff00000
#define PROM_SIZE (1 * MiB) #define PROM_SIZE (1 * MiB)
#define KERNEL_LOAD_ADDR 0x01000000
#define KERNEL_GAP 0x00100000
#define TYPE_CORE99_MACHINE MACHINE_TYPE_NAME("mac99") #define TYPE_CORE99_MACHINE MACHINE_TYPE_NAME("mac99")
typedef struct Core99MachineState Core99MachineState; typedef struct Core99MachineState Core99MachineState;
DECLARE_INSTANCE_CHECKER(Core99MachineState, CORE99_MACHINE, DECLARE_INSTANCE_CHECKER(Core99MachineState, CORE99_MACHINE,

7
hw/ppc/mac_oldworld.c
View File

@ -58,10 +58,15 @@
#define NDRV_VGA_FILENAME "qemu_vga.ndrv" #define NDRV_VGA_FILENAME "qemu_vga.ndrv"
#define GRACKLE_BASE 0xfec00000 #define PROM_FILENAME "openbios-ppc"
#define PROM_BASE 0xffc00000 #define PROM_BASE 0xffc00000
#define PROM_SIZE (4 * MiB) #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, static void fw_cfg_boot_set(void *opaque, const char *boot_device,
Error **errp) Error **errp)
{ {