diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-06 23:45:35 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-06 23:45:35 +0100 |
| commit | f12af1f38dc59a6dfe0fed1359e1a05e700a435b (patch) | |
| tree | 2d019236794576f403496d03511c81454921c743 | |
| parent | f61f59da0fdcec37046680de3972709fe65282ac (diff) | |
| parent | f550c521e123f2c35d742599f19f4aea2db85951 (diff) | |
| download | u-boot-f12af1f38dc59a6dfe0fed1359e1a05e700a435b.tar.gz u-boot-f12af1f38dc59a6dfe0fed1359e1a05e700a435b.tar.xz u-boot-f12af1f38dc59a6dfe0fed1359e1a05e700a435b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | board/freescale/common/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/fsl_diu_fb.c (renamed from board/freescale/common/fsl_diu_fb.c) | 0 | ||||
| -rw-r--r-- | include/configs/aria.h | 1 |
5 files changed, 1 insertions, 5 deletions
@@ -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 905dd7a0ae..1abd3e5670 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 83274c3d7e..2c53a6f3e3 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 35ed938bef..35ed938bef 100644 --- a/board/freescale/common/fsl_diu_fb.c +++ b/drivers/video/fsl_diu_fb.c diff --git a/include/configs/aria.h b/include/configs/aria.h index b3ca8d23f8..3a60de0d47 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -49,7 +49,6 @@ #define CONFIG_E300 1 /* E300 Family */ #define CONFIG_MPC512X 1 /* MPC512X family */ #define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ -#define CONFIG_FSL_DIU_LOGO_BMP 1 /* Don't include FSL DIU binary bmp */ #define CONFIG_SYS_TEXT_BASE 0xFFF00000 |