Commit f724de8d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier/tags/q800-branch-pull-request' into staging 



Add Macintosh Quadra 800 machine in hw/m68k

# gpg: Signature made Mon 28 Oct 2019 18:14:25 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/q800-branch-pull-request:
  BootLinuxConsoleTest: Test the Quadra 800
  hw/m68k: define Macintosh Quadra 800
  hw/m68k: add a dummy SWIM floppy controller
  hw/m68k: add Nubus macfb video card
  hw/m68k: add Nubus support
  hw/m68k: implement ADB bus support for via
  hw/m68k: add VIA support
  dp8393x: manage big endian bus
  esp: add pseudo-DMA as used by Macintosh
  esp: move get_cmd() post-DMA code to get_cmd_cb()
  esp: move handle_ti_cmd() cleanup code to esp_do_dma().

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4599cb95 f7d85525

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -917,6 +917,20 @@ F: hw/m68k/next-*.c 
F: hw/display/next-fb.c

F: include/hw/m68k/next-cube.h



q800

M: Laurent Vivier <laurent@vivier.eu>

S: Maintained

F: hw/m68k/q800.c

F: hw/misc/mac_via.c

F: hw/nubus/*

F: hw/display/macfb.c

F: hw/block/swim.c

F: hw/m68k/bootinfo.h

F: include/hw/misc/mac_via.h

F: include/hw/nubus/*

F: include/hw/display/macfb.h

F: include/hw/block/swim.h



MicroBlaze Machines

-------------------

petalogix_s3adsp1800

arch_init.c

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ 
int graphic_width = 1024;

int graphic_height = 768;

int graphic_depth = 8;

#elif defined(TARGET_M68K)

int graphic_width = 800;

int graphic_height = 600;

int graphic_depth = 8;

#else

int graphic_width = 800;

int graphic_height = 600;

default-configs/m68k-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ CONFIG_SEMIHOSTING=y 
CONFIG_AN5206=y

CONFIG_MCF5208=y

CONFIG_NEXTCUBE=y

CONFIG_Q800=y

hw/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ source isa/Kconfig 
source mem/Kconfig

source misc/Kconfig

source net/Kconfig

source nubus/Kconfig

source nvram/Kconfig

source pci-bridge/Kconfig

source pci-host/Kconfig

hw/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ devices-dirs-y += virtio/ 
devices-dirs-y += watchdog/

devices-dirs-y += xen/

devices-dirs-$(CONFIG_MEM_DEVICE) += mem/

devices-dirs-$(CONFIG_NUBUS) += nubus/

devices-dirs-y += semihosting/

devices-dirs-y += smbios/

endif