* Add a default BIOS for the new amigaone machine so it does not
require out of tree binary blob. * SLOF update to fix virtio serial bugs. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEETkN92lZhb0MpsKeVZ7MCdqhiHK4FAmVof8kACgkQZ7MCdqhi HK71ng//TCpoi02/aZY5kAd1a1NxvRDd/gR9d5y79TaixgJ9FoV7joNg7Labu21r Gezghpgj7Ph+Wy175/qYhIJJ6JheK6xsAb7JmCJUq5HeOixJHkK0xHCJ0uGf1tcb c24+6JYa7K1Yd48EhGQUDwd+7J7QeAKPyJLSZHG2Qg9+sPX2koxa9tzZMoaWoA2L pMfXhUTBiK6Q93FtrQw16pRUcGrY542wLeA/nRaUFtuPdv38TDmJ4ktnid27fIh5 1+QVGQD0HCO29SVT/VP1TJenJukrYVjBfT8ulVC/wo53tZHhNSDVffXbRijrVFlX CPowJ2UebPwpvnvv8F8CSGPL4XPI+IBVdUOwZZMkH5oGaMXQW6mP4zsB7TK+g5z3 8+hQ0VZS0MzrrfSqufup8SUJAqJ1Sckx104clrpXtrBSAoiF634Qi1+UurwDVLFS VibKnMl31LauNRIWXVfj4BYOdH9oHOEHR5ghoaRguOAe58N7fGNiXC/WnScWbp8r PXE9D7SUMPtxNejDFRam+Df7JwTY+CdB56uvZ/behgs3FABfMmqBX+WgBbNhLaP4 B4Wa0MTOAHz3itXRHYtvd6n3M9ts4nU88Srkuf0akAzp4Nv4b3+isuIncUazDREt q2z94oolhuZarLhsi/8Qo2G/SfJBNM0s4fmx4NTrqscupl5SadM= =7rvy -----END PGP SIGNATURE----- Merge tag 'pull-ppc-for-8.2-20231130' of https://gitlab.com/npiggin/qemu into staging * Add a default BIOS for the new amigaone machine so it does not require out of tree binary blob. * SLOF update to fix virtio serial bugs. # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEETkN92lZhb0MpsKeVZ7MCdqhiHK4FAmVof8kACgkQZ7MCdqhi # HK71ng//TCpoi02/aZY5kAd1a1NxvRDd/gR9d5y79TaixgJ9FoV7joNg7Labu21r # Gezghpgj7Ph+Wy175/qYhIJJ6JheK6xsAb7JmCJUq5HeOixJHkK0xHCJ0uGf1tcb # c24+6JYa7K1Yd48EhGQUDwd+7J7QeAKPyJLSZHG2Qg9+sPX2koxa9tzZMoaWoA2L # pMfXhUTBiK6Q93FtrQw16pRUcGrY542wLeA/nRaUFtuPdv38TDmJ4ktnid27fIh5 # 1+QVGQD0HCO29SVT/VP1TJenJukrYVjBfT8ulVC/wo53tZHhNSDVffXbRijrVFlX # CPowJ2UebPwpvnvv8F8CSGPL4XPI+IBVdUOwZZMkH5oGaMXQW6mP4zsB7TK+g5z3 # 8+hQ0VZS0MzrrfSqufup8SUJAqJ1Sckx104clrpXtrBSAoiF634Qi1+UurwDVLFS # VibKnMl31LauNRIWXVfj4BYOdH9oHOEHR5ghoaRguOAe58N7fGNiXC/WnScWbp8r # PXE9D7SUMPtxNejDFRam+Df7JwTY+CdB56uvZ/behgs3FABfMmqBX+WgBbNhLaP4 # B4Wa0MTOAHz3itXRHYtvd6n3M9ts4nU88Srkuf0akAzp4Nv4b3+isuIncUazDREt # q2z94oolhuZarLhsi/8Qo2G/SfJBNM0s4fmx4NTrqscupl5SadM= # =7rvy # -----END PGP SIGNATURE----- # gpg: Signature made Thu 30 Nov 2023 07:27:53 EST # gpg: using RSA key 4E437DDA56616F4329B0A79567B30276A8621CAE # gpg: Good signature from "Nicholas Piggin <npiggin@gmail.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 4E43 7DDA 5661 6F43 29B0 A795 67B3 0276 A862 1CAE * tag 'pull-ppc-for-8.2-20231130' of https://gitlab.com/npiggin/qemu: ppc/amigaone: Allow running AmigaOS without firmware image pseries: Update SLOF firmware image Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
commit
29b5d70cb7
@ -36,10 +36,19 @@
|
||||
* -device VGA,romfile=VGABIOS-lgpl-latest.bin
|
||||
* from http://www.nongnu.org/vgabios/ instead.
|
||||
*/
|
||||
#define PROM_FILENAME "u-boot-amigaone.bin"
|
||||
#define PROM_ADDR 0xfff00000
|
||||
#define PROM_SIZE (512 * KiB)
|
||||
|
||||
/* AmigaOS calls this routine from ROM, use this if no firmware loaded */
|
||||
static const char dummy_fw[] = {
|
||||
0x38, 0x00, 0x00, 0x08, /* li r0,8 */
|
||||
0x7c, 0x09, 0x03, 0xa6, /* mtctr r0 */
|
||||
0x54, 0x63, 0xf8, 0x7e, /* srwi r3,r3,1 */
|
||||
0x42, 0x00, 0xff, 0xfc, /* bdnz 0x8 */
|
||||
0x7c, 0x63, 0x18, 0xf8, /* not r3,r3 */
|
||||
0x4e, 0x80, 0x00, 0x20, /* blr */
|
||||
};
|
||||
|
||||
static void amigaone_cpu_reset(void *opaque)
|
||||
{
|
||||
PowerPCCPU *cpu = opaque;
|
||||
@ -60,8 +69,6 @@ static void amigaone_init(MachineState *machine)
|
||||
PowerPCCPU *cpu;
|
||||
CPUPPCState *env;
|
||||
MemoryRegion *rom, *pci_mem, *mr;
|
||||
const char *fwname = machine->firmware ?: PROM_FILENAME;
|
||||
char *filename;
|
||||
ssize_t sz;
|
||||
PCIBus *pci_bus;
|
||||
Object *via;
|
||||
@ -94,20 +101,24 @@ static void amigaone_init(MachineState *machine)
|
||||
}
|
||||
|
||||
/* allocate and load firmware */
|
||||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, fwname);
|
||||
if (filename) {
|
||||
rom = g_new(MemoryRegion, 1);
|
||||
memory_region_init_rom(rom, NULL, "rom", PROM_SIZE, &error_fatal);
|
||||
memory_region_add_subregion(get_system_memory(), PROM_ADDR, rom);
|
||||
rom = g_new(MemoryRegion, 1);
|
||||
memory_region_init_rom(rom, NULL, "rom", PROM_SIZE, &error_fatal);
|
||||
memory_region_add_subregion(get_system_memory(), PROM_ADDR, rom);
|
||||
if (!machine->firmware) {
|
||||
rom_add_blob_fixed("dummy-fw", dummy_fw, sizeof(dummy_fw),
|
||||
PROM_ADDR + PROM_SIZE - 0x80);
|
||||
} else {
|
||||
g_autofree char *filename = qemu_find_file(QEMU_FILE_TYPE_BIOS,
|
||||
machine->firmware);
|
||||
if (!filename) {
|
||||
error_report("Could not find firmware '%s'", machine->firmware);
|
||||
exit(1);
|
||||
}
|
||||
sz = load_image_targphys(filename, PROM_ADDR, PROM_SIZE);
|
||||
if (sz <= 0 || sz > PROM_SIZE) {
|
||||
error_report("Could not load firmware '%s'", filename);
|
||||
exit(1);
|
||||
}
|
||||
g_free(filename);
|
||||
} else if (!qtest_enabled()) {
|
||||
error_report("Could not find firmware '%s'", fwname);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* Articia S */
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
- SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware
|
||||
implementation for certain IBM POWER hardware. The sources are at
|
||||
https://github.com/aik/SLOF, and the image currently in qemu is
|
||||
built from git tag qemu-slof-20220719.
|
||||
built from git tag qemu-slof-20230918.
|
||||
|
||||
- VOF (Virtual Open Firmware) is a minimalistic firmware to work with
|
||||
-machine pseries,x-vof=on. When enabled, the firmware acts as a slim shim and
|
||||
|
||||
BIN
pc-bios/slof.bin
BIN
pc-bios/slof.bin
Binary file not shown.
@ -1 +1 @@
|
||||
Subproject commit 6b6c16b4b40763507cf1f518096f3c3883c5cf2d
|
||||
Subproject commit 3a259df2449fc4a4e43ab5f33f0b2c66484b4bc3
|
||||
Loading…
Reference in New Issue
Block a user