Merge branch 'master' into master

2021-04-06 07:24:30 +02:00
parent 8edf104668 afa73c5bd6
commit 091b45c104
23 changed files with 522 additions and 122 deletions
--- a/src/machine/m_at_socket4_5.c
+++ b/src/machine/m_at_socket4_5.c
@@ -604,7 +604,7 @@ machine_at_apollo_init(const machine_t *model)
    device_add(&keyboard_ps2_ami_pci_device);
    device_add(&i430fx_device);
    device_add(&piix_device);
-    device_add(&pc87332_ps1_device);
+    device_add(&pc87332_398_device);
    device_add(&intel_flash_bxt_device);

    return ret;