drivers/video : move video drivers to drivers/video
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Tue, 20 Nov 2007 19:41:48 +0000 (20:41 +0100)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sun, 25 Nov 2007 17:35:11 +0000 (18:35 +0100)
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
14 files changed:
Makefile
drivers/Makefile
drivers/video/Makefile [new file with mode: 0644]
drivers/video/ati_ids.h [moved from drivers/ati_ids.h with 100% similarity]
drivers/video/ati_radeon_fb.c [moved from drivers/ati_radeon_fb.c with 99% similarity]
drivers/video/ati_radeon_fb.h [moved from drivers/ati_radeon_fb.h with 100% similarity]
drivers/video/cfb_console.c [moved from drivers/cfb_console.c with 100% similarity]
drivers/video/ct69000.c [moved from drivers/ct69000.c with 100% similarity]
drivers/video/sed13806.c [moved from drivers/sed13806.c with 100% similarity]
drivers/video/sed156x.c [moved from drivers/sed156x.c with 100% similarity]
drivers/video/sm501.c [moved from drivers/sm501.c with 100% similarity]
drivers/video/smiLynxEM.c [moved from drivers/smiLynxEM.c with 100% similarity]
drivers/video/videomodes.c [moved from drivers/videomodes.c with 100% similarity]
drivers/video/videomodes.h [moved from drivers/videomodes.h with 100% similarity]

index 22eea65..8272965 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -210,6 +210,7 @@ LIBS += dtt/libdtt.a
 LIBS += drivers/i2c/libi2c.a
 LIBS += drivers/pci/libpci.a
 LIBS += drivers/pcmcia/libpcmcia.a
+LIBS += drivers/video/libvideo.a
 LIBS += drivers/libdrivers.a
 LIBS += drivers/bios_emulator/libatibiosemu.a
 LIBS += drivers/nand/libnand.a
index 5e31304..c7fc597 100755 (executable)
@@ -48,10 +48,7 @@ COBJS-y += systemace.o
 #
 # Console Drivers
 #
-COBJS-y += ati_radeon_fb.o
 COBJS-y += atmel_usart.o
-COBJS-y += cfb_console.o
-COBJS-y += ct69000.o
 COBJS-y += i8042.o
 COBJS-y += keyboard.o
 COBJS-y += netconsole.o
@@ -60,15 +57,10 @@ COBJS-y += pc_keyb.o
 COBJS-y += ps2ser.o
 COBJS-y += ps2mult.o
 COBJS-y += s3c4510b_uart.o
-COBJS-y += sed13806.o
-COBJS-y += sed156x.o
 COBJS-y += serial.o
 COBJS-y += serial_max3100.o
 COBJS-y += serial_xuartlite.o
-COBJS-y += sm501.o
-COBJS-y += smiLynxEM.o
 COBJS-y += usbtty.o
-COBJS-y += videomodes.o
 
 #
 # Network Drivers
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
new file mode 100644 (file)
index 0000000..36611ec
--- /dev/null
@@ -0,0 +1,53 @@
+#
+# (C) Copyright 2000-2007
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB    := $(obj)libvideo.a
+
+COBJS-y += ati_radeon_fb.o
+COBJS-y += cfb_console.o
+COBJS-y += ct69000.o
+COBJS-y += sed13806.o
+COBJS-y += sed156x.o
+COBJS-y += sm501.o
+COBJS-y += smiLynxEM.o
+COBJS-y += videomodes.o
+
+COBJS  := $(COBJS-y)
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+
+all:   $(LIB)
+
+$(LIB):        $(obj).depend $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
similarity index 100%
rename from drivers/ati_ids.h
rename to drivers/video/ati_ids.h
similarity index 99%
rename from drivers/ati_radeon_fb.c
rename to drivers/video/ati_radeon_fb.c
index 9613d80..0bdaa1c 100644 (file)
@@ -350,7 +350,7 @@ void radeon_setmode(void)
        radeon_write_pll_regs(rinfo, mode);
 }
 
-#include "bios_emulator/include/biosemu.h"
+#include "../bios_emulator/include/biosemu.h"
 extern int BootVideoCardBIOS(pci_dev_t pcidev, BE_VGAInfo ** pVGAInfo, int cleanUp);
 
 int radeon_probe(struct radeonfb_info *rinfo)
similarity index 100%
rename from drivers/ct69000.c
rename to drivers/video/ct69000.c
similarity index 100%
rename from drivers/sed13806.c
rename to drivers/video/sed13806.c
similarity index 100%
rename from drivers/sed156x.c
rename to drivers/video/sed156x.c
similarity index 100%
rename from drivers/sm501.c
rename to drivers/video/sm501.c