diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2007-11-20 19:41:48 (GMT) |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2007-11-25 17:35:11 (GMT) |
commit | 352d259130b349fe9593b8dada641bd78a9659e5 (patch) | |
tree | c2e1d53d857f01ebcab98aba666e4dc40a3669f2 | |
parent | 73646217186aa17afc8e305c5f06f06dd335eaad (diff) | |
download | u-boot-352d259130b349fe9593b8dada641bd78a9659e5.tar.xz |
drivers/video : move video drivers to drivers/video
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r-- | Makefile | 1 | ||||
-rwxr-xr-x | drivers/Makefile | 8 | ||||
-rw-r--r-- | drivers/video/Makefile | 53 | ||||
-rw-r--r-- | drivers/video/ati_ids.h (renamed from drivers/ati_ids.h) | 0 | ||||
-rw-r--r-- | drivers/video/ati_radeon_fb.c (renamed from drivers/ati_radeon_fb.c) | 2 | ||||
-rw-r--r-- | drivers/video/ati_radeon_fb.h (renamed from drivers/ati_radeon_fb.h) | 0 | ||||
-rw-r--r-- | drivers/video/cfb_console.c (renamed from drivers/cfb_console.c) | 0 | ||||
-rw-r--r-- | drivers/video/ct69000.c (renamed from drivers/ct69000.c) | 0 | ||||
-rw-r--r-- | drivers/video/sed13806.c (renamed from drivers/sed13806.c) | 0 | ||||
-rw-r--r-- | drivers/video/sed156x.c (renamed from drivers/sed156x.c) | 0 | ||||
-rw-r--r-- | drivers/video/sm501.c (renamed from drivers/sm501.c) | 0 | ||||
-rw-r--r-- | drivers/video/smiLynxEM.c (renamed from drivers/smiLynxEM.c) | 0 | ||||
-rw-r--r-- | drivers/video/videomodes.c (renamed from drivers/videomodes.c) | 0 | ||||
-rw-r--r-- | drivers/video/videomodes.h (renamed from drivers/videomodes.h) | 0 |
14 files changed, 55 insertions, 9 deletions
@@ -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 diff --git a/drivers/Makefile b/drivers/Makefile index 5e31304..c7fc597 100755 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -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 index 0000000..36611ec --- /dev/null +++ b/drivers/video/Makefile @@ -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 + +######################################################################### diff --git a/drivers/ati_ids.h b/drivers/video/ati_ids.h index 3e72a7d..3e72a7d 100644 --- a/drivers/ati_ids.h +++ b/drivers/video/ati_ids.h diff --git a/drivers/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c index 9613d80..0bdaa1c 100644 --- a/drivers/ati_radeon_fb.c +++ b/drivers/video/ati_radeon_fb.c @@ -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) diff --git a/drivers/ati_radeon_fb.h b/drivers/video/ati_radeon_fb.h index b5c4b8b..b5c4b8b 100644 --- a/drivers/ati_radeon_fb.h +++ b/drivers/video/ati_radeon_fb.h diff --git a/drivers/cfb_console.c b/drivers/video/cfb_console.c index bcf8771..bcf8771 100644 --- a/drivers/cfb_console.c +++ b/drivers/video/cfb_console.c diff --git a/drivers/ct69000.c b/drivers/video/ct69000.c index 29d82e4..29d82e4 100644 --- a/drivers/ct69000.c +++ b/drivers/video/ct69000.c diff --git a/drivers/sed13806.c b/drivers/video/sed13806.c index 6996ca8..6996ca8 100644 --- a/drivers/sed13806.c +++ b/drivers/video/sed13806.c diff --git a/drivers/sed156x.c b/drivers/video/sed156x.c index e9d5ed4..e9d5ed4 100644 --- a/drivers/sed156x.c +++ b/drivers/video/sed156x.c diff --git a/drivers/sm501.c b/drivers/video/sm501.c index 23db02c..23db02c 100644 --- a/drivers/sm501.c +++ b/drivers/video/sm501.c diff --git a/drivers/smiLynxEM.c b/drivers/video/smiLynxEM.c index 20f9beb..20f9beb 100644 --- a/drivers/smiLynxEM.c +++ b/drivers/video/smiLynxEM.c diff --git a/drivers/videomodes.c b/drivers/video/videomodes.c index c81e5bc..c81e5bc 100644 --- a/drivers/videomodes.c +++ b/drivers/video/videomodes.c diff --git a/drivers/videomodes.h b/drivers/video/videomodes.h index e2dffe7..e2dffe7 100644 --- a/drivers/videomodes.h +++ b/drivers/video/videomodes.h |