summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2010-11-29 21:17:37 +0100
committerAnatolij Gustschin <agust@denx.de>2010-12-01 20:48:13 +0100
commit14f88c43fcb7cee954648daeaba08b8e881ec01b (patch)
treec77b9ecd6dc50f61f31cdfcc20a8bba1d0728160
parent49733aa0b9d29803384ad4bce74985f4bbe7e9aa (diff)
downloadu-boot-imx-14f88c43fcb7cee954648daeaba08b8e881ec01b.zip
u-boot-imx-14f88c43fcb7cee954648daeaba08b8e881ec01b.tar.gz
u-boot-imx-14f88c43fcb7cee954648daeaba08b8e881ec01b.tar.bz2
video: move fsl_diu_fb driver to drivers/video
Since the driver is used not only on Freescale boards, we move it to a common place for video drivers as suggested by Wolfgang. The patch also cleans up the top level Makefile. Signed-off-by: Anatolij Gustschin <agust@denx.de>
-rw-r--r--Makefile3
-rw-r--r--board/freescale/common/Makefile1
-rw-r--r--drivers/video/Makefile1
-rw-r--r--drivers/video/fsl_diu_fb.c (renamed from board/freescale/common/fsl_diu_fb.c)0
4 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 87a383d..0685ef9 100644
--- a/Makefile
+++ b/Makefile
@@ -185,9 +185,6 @@ LIBS += lib/lzma/liblzma.o
LIBS += lib/lzo/liblzo.o
LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
"board/$(VENDOR)/common/lib$(VENDOR).o"; fi)
-ifdef CONFIG_FSL_DIU_FB
-LIBS += board/freescale/common/libfreescale.o
-endif
LIBS += $(CPUDIR)/lib$(CPU).o
ifdef SOC
LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).o
diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index 905dd7a..1abd3e5 100644
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -31,7 +31,6 @@ LIB = $(obj)libfreescale.o
COBJS-$(CONFIG_FSL_CADMUS) += cadmus.o
COBJS-$(CONFIG_FSL_VIA) += cds_via.o
-COBJS-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o
COBJS-$(CONFIG_FSL_PIXIS) += pixis.o
COBJS-$(CONFIG_FSL_NGPIXIS) += ngpixis.o
COBJS-$(CONFIG_PQ_MDS_PIB) += pq-mds-pib.o
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 83274c3..2c53a6f 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -28,6 +28,7 @@ LIB := $(obj)libvideo.o
COBJS-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o videomodes.o
COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o
COBJS-$(CONFIG_CFB_CONSOLE) += cfb_console.o
+COBJS-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o
COBJS-$(CONFIG_S6E63D6) += s6e63d6.o
COBJS-$(CONFIG_VIDEO_AMBA) += amba.o
COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o
diff --git a/board/freescale/common/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index 35ed938..35ed938 100644
--- a/board/freescale/common/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c