Skip to content

Commit 8ac919a

Browse files
committed
hw/m68k: add Nubus macfb video card
This patch adds support for a graphic framebuffer device. This device can be added as a sysbus device or as a NuBus device. It is accessed as a framebuffer but the color palette can be set. Co-developed-by: Mark Cave-Ayland <[email protected]> Signed-off-by: Mark Cave-Ayland <[email protected]> Signed-off-by: Laurent Vivier <[email protected]> Reviewed-by: Hervé Poussineau <[email protected]> Reviewed-by: Thomas Huth <[email protected]> Message-Id: <[email protected]>
1 parent fa2ba3b commit 8ac919a

File tree

9 files changed

+557
-2
lines changed

9 files changed

+557
-2
lines changed

MAINTAINERS

+2
Original file line numberDiff line numberDiff line change
@@ -922,8 +922,10 @@ M: Laurent Vivier <[email protected]>
922922
S: Maintained
923923
F: hw/misc/mac_via.c
924924
F: hw/nubus/*
925+
F: hw/display/macfb.c
925926
F: include/hw/misc/mac_via.h
926927
F: include/hw/nubus/*
928+
F: include/hw/display/macfb.h
927929

928930
MicroBlaze Machines
929931
-------------------

arch_init.c

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
int graphic_width = 1024;
3939
int graphic_height = 768;
4040
int graphic_depth = 8;
41+
#elif defined(TARGET_M68K)
42+
int graphic_width = 800;
43+
int graphic_height = 600;
44+
int graphic_depth = 8;
4145
#else
4246
int graphic_width = 800;
4347
int graphic_height = 600;

hw/display/Kconfig

+5
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,8 @@ config ATI_VGA
132132
select VGA
133133
select BITBANG_I2C
134134
select DDC
135+
136+
config MACFB
137+
bool
138+
select FRAMEBUFFER
139+
depends on NUBUS

hw/display/Makefile.objs

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o
2626
common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o
2727
obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
2828
common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
29+
common-obj-$(CONFIG_MACFB) += macfb.o
2930

3031
obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o
3132
milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS)

0 commit comments

Comments
 (0)