Hi. Below is a patch that removes imacfb entirely, merging its DMI
table into the (otherwise very similar) efifb driver. This also adds
hardware support for many of the newer Intel Apple hardware. This has
been fairly well tested; we've been shipping it in Fedora for some time.
Kconfig | 15 --
Makefile | 1
efifb.c | 191 ++++++++++++++++++++++++++++++--
imacfb.c | 376 ---------------------------------------------------------------
4 files changed, 184 insertions(+), 399 deletions(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 70d135e..be947ff 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -687,23 +687,14 @@ config FB_VESA
config FB_EFI
bool "EFI-based Framebuffer Support"
- depends on (FB = y) && X86
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
- help
- This is the EFI frame buffer device driver. If the firmware on
- your platform is UEFI2.0, select Y to add support for
- Graphics Output Protocol for early console messages to appear.
-
-config FB_IMAC
- bool "Intel-based Macintosh Framebuffer Support"
depends on (FB = y) && X86 && EFI
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
help
- This is the frame buffer device driver for the Intel-based Macintosh
+ This is the EFI frame buffer device driver. If the firmware on
+ your platform is EFI 1.10 or UEFI 2.0, select Y to add support for
+ using the EFI framebuffer as your console.
config FB_N411
tristate "N411 Apollo/Hecuba devkit support"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index a6b5529..2e0cd0c 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -125,7 +125,6 @@ obj-$(CONFIG_FB_CARMINE) += carminefb.o
# Platform or fallback drivers go here
obj-$(CONFIG_FB_UVESA) += uvesafb.o
obj-$(CONFIG_FB_VESA) += vesafb.o
-obj-$(CONFIG_FB_IMAC) += imacfb.o
...
