From: Michal Simek monstr@monstr.eu
Signed-off-by: Michal Simek monstr@monstr.eu --- drivers/video/Makefile | 16 ++++++++-------- drivers/video/ati_radeon_fb.c | 3 --- drivers/video/cfb_console.c | 3 --- drivers/video/ct69000.c | 5 ----- drivers/video/mb862xx.c | 3 --- drivers/video/sed13806.c | 3 --- drivers/video/sed156x.c | 4 ---- drivers/video/sm501.c | 4 ---- drivers/video/smiLynxEM.c | 4 ---- 9 files changed, 8 insertions(+), 37 deletions(-)
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 20a54c5..7fba29f 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -25,15 +25,15 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libvideo.a
-COBJS-y += ati_radeon_fb.o +COBJS-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o -COBJS-y += cfb_console.o -COBJS-y += ct69000.o -COBJS-y += mb862xx.o -COBJS-y += sed13806.o -COBJS-y += sed156x.o -COBJS-y += sm501.o -COBJS-y += smiLynxEM.o +COBJS-$(CONFIG_CFB_CONSOLE) += cfb_console.o +COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o +COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o +COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o +COBJS-$(CONFIG_SED156X) += sed156x.o +COBJS-$(CONFIG_VIDEO_SM501) += sm501.o +COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o COBJS-y += videomodes.o
COBJS := $(COBJS-y) diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c index a1e7bae..650380b 100644 --- a/drivers/video/ati_radeon_fb.c +++ b/drivers/video/ati_radeon_fb.c @@ -35,8 +35,6 @@
#include <common.h>
-#ifdef CONFIG_ATI_RADEON_FB - #include <command.h> #include <pci.h> #include <asm/processor.h> @@ -777,4 +775,3 @@ void video_set_lut (unsigned int index, /* color number */ OUTREG(PALETTE_INDEX, index); OUTREG(PALETTE_DATA, (r << 16) | (g << 8) | b); } -#endif diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 68b9861..dce2a24 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -92,8 +92,6 @@ CONFIG_VIDEO_HW_CURSOR: - Uses the hardware cursor capability of the
#include <common.h>
-#ifdef CONFIG_CFB_CONSOLE - #include <malloc.h>
/*****************************************************************************/ @@ -1337,4 +1335,3 @@ int drv_video_init (void) /* No console dev available */ return 0; } -#endif /* CONFIG_CFB_CONSOLE */ diff --git a/drivers/video/ct69000.c b/drivers/video/ct69000.c index 29d82e4..cae662e 100644 --- a/drivers/video/ct69000.c +++ b/drivers/video/ct69000.c @@ -31,8 +31,6 @@ #include <video_fb.h> #include "videomodes.h"
-#ifdef CONFIG_VIDEO_CT69000 - /* debug */ #undef VGA_DEBUG #undef VGA_DUMP_REG @@ -1280,7 +1278,4 @@ video_hw_bitblt (unsigned int bpp, /* bytes per pixel */ out32r (pGD->pciBase + BR08_o, (dim_y << 16) + dim_x); /* start the BITBlt */ video_wait_bitblt (pGD->pciBase + BR04_o); } - -#endif /* CONFIG_CT69000 */ - #endif /* CONFIG_VIDEO */ diff --git a/drivers/video/mb862xx.c b/drivers/video/mb862xx.c index 733d9a2..6c14b0d 100644 --- a/drivers/video/mb862xx.c +++ b/drivers/video/mb862xx.c @@ -28,8 +28,6 @@
#include <common.h>
-#if defined(CONFIG_VIDEO_MB862xx) - #include <asm/io.h> #include <pci.h> #include <video_fb.h> @@ -416,4 +414,3 @@ void video_hw_bitblt (unsigned int bpp, unsigned int src_x, unsigned int src_y, DE_WR_FIFO ((height << 16) | width); de_wait (); /* sync */ } -#endif /* CONFIG_VIDEO_MB862xx */ diff --git a/drivers/video/sed13806.c b/drivers/video/sed13806.c index 6996ca8..9cd19b5 100644 --- a/drivers/video/sed13806.c +++ b/drivers/video/sed13806.c @@ -25,8 +25,6 @@
#include <common.h>
-#ifdef CONFIG_VIDEO_SED13806 - #include <video_fb.h> #include <sed13806.h>
@@ -307,4 +305,3 @@ void video_init_hw_cursor (int font_width, int font_height) writeByte (LCD_CURSOR_CNTL, 1); } #endif -#endif diff --git a/drivers/video/sed156x.c b/drivers/video/sed156x.c index e9d5ed4..707250d 100644 --- a/drivers/video/sed156x.c +++ b/drivers/video/sed156x.c @@ -28,8 +28,6 @@
#include <sed156x.h>
-#ifdef CONFIG_SED156X - /* configure according to the selected display */ #if defined(CONFIG_SED156X_PG12864Q) #define LCD_WIDTH 128 @@ -562,5 +560,3 @@ void sed156x_init(void) sed156x_sync(); sed156x_cmd_transfer(LCD_ON); /* Turn display ON */ } - -#endif /* CONFIG_SED156X */ diff --git a/drivers/video/sm501.c b/drivers/video/sm501.c index 23db02c..283d2d9 100644 --- a/drivers/video/sm501.c +++ b/drivers/video/sm501.c @@ -31,8 +31,6 @@
#include <common.h>
-#ifdef CONFIG_VIDEO_SM501 - #include <video_fb.h> #include <sm501.h>
@@ -146,5 +144,3 @@ void video_set_lut ( ) { } - -#endif /* CONFIG_VIDEO_SM501 */ diff --git a/drivers/video/smiLynxEM.c b/drivers/video/smiLynxEM.c index 20f9beb..390dd56 100644 --- a/drivers/video/smiLynxEM.c +++ b/drivers/video/smiLynxEM.c @@ -40,8 +40,6 @@
#include <common.h>
-#if defined(CONFIG_VIDEO_SMI_LYNXEM) - #include <pci.h> #include <video_fb.h> #include "videomodes.h" @@ -854,5 +852,3 @@ void video_set_lut ( out8 (SMI_LUT_RGB, b>>2); /* blue */ udelay (10); } - -#endif /* CONFIG_VIDEO_SMI_LYNXEM */