From: Jon Smirl <jonsmirl@gmail.com>:
Allow the framebuffer core to be built as a module to ease debugging.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/video/Kconfig | 74 ++++++++++++++++++++---------------------
25-akpm/drivers/video/Makefile | 8 ++--
25-akpm/drivers/video/fbmem.c | 15 ++++++++
3 files changed, 57 insertions(+), 40 deletions(-)
diff -puN drivers/video/fbmem.c~fbdev-allow-core-fb-to-be-built-as-a-module drivers/video/fbmem.c
--- 25/drivers/video/fbmem.c~fbdev-allow-core-fb-to-be-built-as-a-module Sun Mar 6 17:18:09 2005
+++ 25-akpm/drivers/video/fbmem.c Sun Mar 6 17:18:09 2005
@@ -1205,7 +1205,22 @@ fbmem_init(void)
}
return 0;
}
+
+void __exit
+fbmem_exit(void)
+{
+ class_simple_destroy(fb_class);
+}
+
+#ifdef MODULE
+module_init(fbmem_init);
+module_exit(fbmem_exit);
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Framebuffer base");
+#else
subsys_initcall(fbmem_init);
+subsys_exitcall(fbmem_exit);
+#endif
int fb_new_modelist(struct fb_info *info)
{
diff -puN drivers/video/Kconfig~fbdev-allow-core-fb-to-be-built-as-a-module drivers/video/Kconfig
--- 25/drivers/video/Kconfig~fbdev-allow-core-fb-to-be-built-as-a-module Sun Mar 6 17:18:09 2005
+++ 25-akpm/drivers/video/Kconfig Sun Mar 6 17:18:09 2005
@@ -5,7 +5,7 @@
menu "Graphics support"
config FB
- bool "Support for frame buffer devices"
+ tristate "Support for frame buffer devices"
---help---
The frame buffer device provides an abstraction for the graphics
hardware. It represents the frame buffer of some video hardware and
@@ -160,7 +160,7 @@ config FB_ARMCLCD
config FB_ACORN
bool "Acorn VIDC support"
- depends on FB && ARM && ARCH_ACORN
+ depends on (FB = y) && ARM && ARCH_ACORN
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -172,7 +172,7 @@ config FB_ACORN
config FB_CLPS711X
bool "CLPS711X LCD support"
- depends on FB && ARM && ARCH_CLPS711X
+ depends on (FB = y) && ARM && ARCH_CLPS711X
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -180,7 +180,7 @@ config FB_CLPS711X
config FB_SA1100
bool "SA-1100 LCD support"
- depends on FB && ARM && ARCH_SA1100
+ depends on (FB = y) && ARM && ARCH_SA1100
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -208,7 +208,7 @@ config FB_CYBER2000
config FB_APOLLO
bool
- depends on FB && APOLLO
+ depends on (FB = y) && APOLLO
default y
select FB_CFB_FILLRECT
select FB_CFB_IMAGEBLIT
@@ -216,7 +216,7 @@ config FB_APOLLO
config FB_Q40
bool
- depends on FB && Q40
+ depends on (FB = y) && Q40
default y
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
@@ -277,7 +277,7 @@ config FB_CYBER
config FB_VIRGE
bool "Amiga CyberVision 64/3D support "
- depends on FB && ZORRO && BROKEN
+ depends on (FB = y) && ZORRO && BROKEN
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -292,7 +292,7 @@ config FB_VIRGE
config FB_RETINAZ3
tristate "Amiga Retina Z3 support"
- depends on FB && ZORRO && BROKEN
+ depends on (FB = y) && ZORRO && BROKEN
help
This enables support for the Retina Z3 graphics card. Say N unless
you have a Retina Z3 or plan to get one before you next recompile
@@ -300,7 +300,7 @@ config FB_RETINAZ3
config FB_FM2
bool "Amiga FrameMaster II/Rainbow II support"
- depends on FB && ZORRO
+ depends on (FB = y) && ZORRO
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -311,14 +311,14 @@ config FB_FM2
config FB_ATARI
bool "Atari native chipset support"
- depends on FB && ATARI && BROKEN
+ depends on (FB = y) && ATARI && BROKEN
help
This is the frame buffer device driver for the builtin graphics
chipset found in Ataris.
config FB_OF
bool "Open Firmware frame buffer device support"
- depends on FB && (PPC64 || PPC_OF)
+ depends on (FB = y) && (PPC64 || PPC_OF)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -329,7 +329,7 @@ config FB_OF
config FB_CONTROL
bool "Apple \"control\" display support"
- depends on FB && PPC_PMAC
+ depends on (FB = y) && PPC_PMAC
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -340,7 +340,7 @@ config FB_CONTROL
config FB_PLATINUM
bool "Apple \"platinum\" display support"
- depends on FB && PPC_PMAC
+ depends on (FB = y) && PPC_PMAC
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -351,7 +351,7 @@ config FB_PLATINUM
config FB_VALKYRIE
bool "Apple \"valkyrie\" display support"
- depends on FB && (MAC || PPC_PMAC)
+ depends on (FB = y) && (MAC || PPC_PMAC)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -362,7 +362,7 @@ config FB_VALKYRIE
config FB_CT65550
bool "Chips 65550 display support"
- depends on FB && PPC
+ depends on (FB = y) && PPC
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -373,7 +373,7 @@ config FB_CT65550
config FB_ASILIANT
bool "Chips 69000 display support"
- depends on FB && PCI
+ depends on (FB = y) && PCI
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -381,7 +381,7 @@ config FB_ASILIANT
config FB_IMSTT
bool "IMS Twin Turbo display support"
- depends on FB && PCI
+ depends on (FB = y) && PCI
select FB_CFB_IMAGEBLIT
select FB_SOFT_CURSOR
help
@@ -390,7 +390,7 @@ config FB_IMSTT
config FB_S3TRIO
bool "S3 Trio display support"
- depends on FB && PPC && BROKEN
+ depends on (FB = y) && PPC && BROKEN
help
If you have a S3 Trio say Y. Say N for S3 Virge.
@@ -431,7 +431,7 @@ config FB_STI
config FB_MAC
bool "Generic Macintosh display support"
- depends on FB && MAC
+ depends on (FB = y) && MAC
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -440,7 +440,7 @@ config FB_MAC
# bool ' Apple DAFB display support' CONFIG_FB_DAFB
config FB_HP300
bool
- depends on FB && HP300
+ depends on (FB = y) && HP300
select FB_CFB_FILLRECT
select FB_CFB_IMAGEBLIT
select FB_SOFT_CURSOR
@@ -459,7 +459,7 @@ config FB_TGA
config FB_VESA
bool "VESA VGA graphics support"
- depends on FB && (X86 || X86_64)
+ depends on (FB = y) && (X86 || X86_64)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -501,7 +501,7 @@ config FB_HGA_ACCEL
config VIDEO_SELECT
bool
- depends on FB && X86
+ depends on (FB = y) && X86
default y
config FB_SGIVW
@@ -516,7 +516,7 @@ config FB_SGIVW
config FB_GBE
bool "SGI Graphics Backend frame buffer support"
- depends on FB && (SGI_IP32 || X86_VISWS)
+ depends on (FB = y) && (SGI_IP32 || X86_VISWS)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -535,16 +535,16 @@ config FB_GBE_MEM
config BUS_I2C
bool
- depends on FB && VISWS
+ depends on (FB = y) && VISWS
default y
config FB_SUN3
bool "Sun3 framebuffer support"
- depends on FB && (SUN3 || SUN3X) && BROKEN
+ depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
config FB_BW2
bool "BWtwo support"
- depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -554,7 +554,7 @@ config FB_BW2
config FB_CG3
bool "CGthree support"
- depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
select FB_SOFT_CURSOR
@@ -563,7 +563,7 @@ config FB_CG3
config FB_CG6
bool "CGsix (GX,TurboGX) support"
- depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
select FB_SOFT_CURSOR
@@ -595,7 +595,7 @@ config FB_PVR2
config FB_EPSON1355
bool "Epson 1355 framebuffer support"
- depends on FB && (SUPERH || ARCH_CEIVA)
+ depends on (FB = y) && (SUPERH || ARCH_CEIVA)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -1209,13 +1209,13 @@ config PB1500_TFT
config FB_AU1100
bool "Au1100 LCD Driver"
- depends on FB && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y
+ depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y
source "drivers/video/geode/Kconfig"
config FB_SBUS
bool "SBUS and UPA framebuffers"
- depends on FB && (SPARC32 || SPARC64)
+ depends on (FB = y) && (SPARC32 || SPARC64)
help
Say Y if you want support for SBUS or UPA based frame buffer device.
@@ -1275,7 +1275,7 @@ config FB_LEO
config FB_PCI
bool "PCI framebuffers"
- depends on FB && PCI && (SPARC64 || SPARC32)
+ depends on (FB = y) && PCI && (SPARC64 || SPARC32)
config FB_IGA
bool "IGA 168x display support"
@@ -1301,7 +1301,7 @@ config FB_HIT
config FB_PMAG_AA
bool "PMAG-AA TURBOchannel framebuffer support"
- depends on FB && MACH_DECSTATION && TC
+ depends on (FB = y) && MACH_DECSTATION && TC
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -1312,7 +1312,7 @@ config FB_PMAG_AA
config FB_PMAG_BA
bool "PMAG-BA TURBOchannel framebuffer support"
- depends on FB && MACH_DECSTATION && TC
+ depends on (FB = y) && MACH_DECSTATION && TC
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -1323,7 +1323,7 @@ config FB_PMAG_BA
config FB_PMAGB_B
bool "PMAGB-B TURBOchannel framebuffer support"
- depends on FB && MACH_DECSTATION && TC
+ depends on (FB = y) && MACH_DECSTATION && TC
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -1335,7 +1335,7 @@ config FB_PMAGB_B
config FB_MAXINE
bool "Maxine (Personal DECstation) onboard framebuffer support"
- depends on FB && MACH_DECSTATION && TC
+ depends on (FB = y) && MACH_DECSTATION && TC
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -1347,7 +1347,7 @@ config FB_MAXINE
config FB_TX3912
bool "TMPTX3912/PR31700 frame buffer support"
- depends on FB && NINO
+ depends on (FB = y) && NINO
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
diff -puN drivers/video/Makefile~fbdev-allow-core-fb-to-be-built-as-a-module drivers/video/Makefile
--- 25/drivers/video/Makefile~fbdev-allow-core-fb-to-be-built-as-a-module Sun Mar 6 17:18:09 2005
+++ 25-akpm/drivers/video/Makefile Sun Mar 6 17:18:09 2005
@@ -8,11 +8,13 @@ obj-$(CONFIG_VT) += console/
obj-$(CONFIG_LOGO) += logo/
obj-$(CONFIG_SYSFS) += backlight/
-obj-$(CONFIG_FB) += fbmem.o fbmon.o fbcmap.o fbsysfs.o modedb.o
+obj-$(CONFIG_FB) += fb.o
+fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o modedb.o
+ifneq ($(CONFIG_FB),n)
+fb-$(CONFIG_PPC) += macmodes.o
# Only include macmodes.o if we have FB support and are PPC
-ifeq ($(CONFIG_FB),y)
-obj-$(CONFIG_PPC) += macmodes.o
endif
+fb-objs := $(fb-y)
obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o
obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o
_