diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-10-29 16:27:48 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-10-29 16:27:48 +0000 |
commit | f724de8dde4cc8d8159e4811714aeca222d9eb70 (patch) | |
tree | d9f88e884b8fd4585423e6f6ccc807ba31fad596 /hw/display/Kconfig | |
parent | 4599cb953c9744bb7dc3513d688f7f0100ee35e2 (diff) | |
parent | f7d85525f14b99aaa7bf561c9f3cf11c85a080c9 (diff) | |
download | qemu-f724de8dde4cc8d8159e4811714aeca222d9eb70.zip qemu-f724de8dde4cc8d8159e4811714aeca222d9eb70.tar.gz qemu-f724de8dde4cc8d8159e4811714aeca222d9eb70.tar.bz2 |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/Kconfig')
-rw-r--r-- | hw/display/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/display/Kconfig b/hw/display/Kconfig index cbdf7b1..c500d1f 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -132,3 +132,8 @@ config ATI_VGA select VGA select BITBANG_I2C select DDC + +config MACFB + bool + select FRAMEBUFFER + depends on NUBUS |