From 352d259130b349fe9593b8dada641bd78a9659e5 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 20 Nov 2007 20:41:48 +0100
Subject: [PATCH] drivers/video : move video drivers to drivers/video
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
Makefile | 1 +
drivers/Makefile | 8 -----
drivers/video/Makefile | 53 +++++++++++++++++++++++++++++
drivers/{ => video}/ati_ids.h | 0
drivers/{ => video}/ati_radeon_fb.c | 2 +-
drivers/{ => video}/ati_radeon_fb.h | 0
drivers/{ => video}/cfb_console.c | 0
drivers/{ => video}/ct69000.c | 0
drivers/{ => video}/sed13806.c | 0
drivers/{ => video}/sed156x.c | 0
drivers/{ => video}/sm501.c | 0
drivers/{ => video}/smiLynxEM.c | 0
drivers/{ => video}/videomodes.c | 0
drivers/{ => video}/videomodes.h | 0
14 files changed, 55 insertions(+), 9 deletions(-)
create mode 100644 drivers/video/Makefile
rename drivers/{ => video}/ati_ids.h (100%)
rename drivers/{ => video}/ati_radeon_fb.c (99%)
rename drivers/{ => video}/ati_radeon_fb.h (100%)
rename drivers/{ => video}/cfb_console.c (100%)
rename drivers/{ => video}/ct69000.c (100%)
rename drivers/{ => video}/sed13806.c (100%)
rename drivers/{ => video}/sed156x.c (100%)
rename drivers/{ => video}/sm501.c (100%)
rename drivers/{ => video}/smiLynxEM.c (100%)
rename drivers/{ => video}/videomodes.c (100%)
rename drivers/{ => video}/videomodes.h (100%)
diff --git a/Makefile b/Makefile
index 22eea65d01c..8272965ab3f 100644
--- 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
diff --git a/drivers/Makefile b/drivers/Makefile
index 5e31304139e..c7fc5972280 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 00000000000..36611ecdda9
--- /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
similarity index 100%
rename from drivers/ati_ids.h
rename to drivers/video/ati_ids.h
diff --git a/drivers/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
similarity index 99%
rename from drivers/ati_radeon_fb.c
rename to drivers/video/ati_radeon_fb.c
index 9613d80cc85..0bdaa1c04d7 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
similarity index 100%
rename from drivers/ati_radeon_fb.h
rename to drivers/video/ati_radeon_fb.h
diff --git a/drivers/cfb_console.c b/drivers/video/cfb_console.c
similarity index 100%
rename from drivers/cfb_console.c
rename to drivers/video/cfb_console.c
diff --git a/drivers/ct69000.c b/drivers/video/ct69000.c
similarity index 100%
rename from drivers/ct69000.c
rename to drivers/video/ct69000.c
diff --git a/drivers/sed13806.c b/drivers/video/sed13806.c
similarity index 100%
rename from drivers/sed13806.c
rename to drivers/video/sed13806.c
diff --git a/drivers/sed156x.c b/drivers/video/sed156x.c
similarity index 100%
rename from drivers/sed156x.c
rename to drivers/video/sed156x.c
diff --git a/drivers/sm501.c b/drivers/video/sm501.c
similarity index 100%
rename from drivers/sm501.c
rename to drivers/video/sm501.c
diff --git a/drivers/smiLynxEM.c b/drivers/video/smiLynxEM.c
similarity index 100%
rename from drivers/smiLynxEM.c
rename to drivers/video/smiLynxEM.c
diff --git a/drivers/videomodes.c b/drivers/video/videomodes.c
similarity index 100%
rename from drivers/videomodes.c
rename to drivers/video/videomodes.c
diff --git a/drivers/videomodes.h b/drivers/video/videomodes.h
similarity index 100%
rename from drivers/videomodes.h
rename to drivers/video/videomodes.h
--
GitLab