From: Robby Cai Date: Thu, 27 Sep 2012 13:02:01 +0000 (+0800) Subject: ENGR00225981-4 IPU: Remove IPU fb build for MX6SL X-Git-Tag: v3.0.35-fsl~402 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eed3f6b70a05ab5b617d94fef9f43258dc7713a6;p=karo-tx-linux.git ENGR00225981-4 IPU: Remove IPU fb build for MX6SL Filter out IPU framebuffer for MX6SL by adding conditional control. Signed-off-by: Robby Cai --- diff --git a/drivers/video/mxc/Kconfig b/drivers/video/mxc/Kconfig index 8064978733ae..8a4a0792724f 100644 --- a/drivers/video/mxc/Kconfig +++ b/drivers/video/mxc/Kconfig @@ -1,6 +1,6 @@ config FB_MXC tristate "MXC Framebuffer support" - depends on FB && (MXC_IPU || ARCH_MX21 || ARCH_MX27 || ARCH_MX25) + depends on FB && (MXC_IPU || ARCH_MX21 || ARCH_MX27 || ARCH_MX25 || ARCH_MX6) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT diff --git a/drivers/video/mxc/Makefile b/drivers/video/mxc/Makefile index 4ce581ad3466..092d0aacba27 100644 --- a/drivers/video/mxc/Makefile +++ b/drivers/video/mxc/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_FB_MXC_SII902X_ELCDIF) += mxcfb_sii902x_elcdif.o obj-$(CONFIG_FB_MXC_LDB) += ldb.o obj-$(CONFIG_FB_MXC_MIPI_DSI) += mipi_dsi.o obj-$(CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL) += mxcfb_hx8369_wvga.o -obj-$(CONFIG_FB_MXC_EDID) += mxc_edid.o mxc_dvi.o +obj-$(CONFIG_FB_MXC_EDID) += mxc_edid.o ifeq ($(CONFIG_ARCH_MX21)$(CONFIG_ARCH_MX27)$(CONFIG_ARCH_MX25),y) obj-$(CONFIG_FB_MXC_TVOUT) += fs453.o obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mx2fb.o mxcfb_modedb.o @@ -12,8 +12,10 @@ ifeq ($(CONFIG_ARCH_MX21)$(CONFIG_ARCH_MX27)$(CONFIG_ARCH_MX25),y) else ifeq ($(CONFIG_MXC_IPU_V1),y) obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxcfb.o mxcfb_modedb.o -else +endif +ifeq ($(CONFIG_MXC_IPU_V3),y) obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxc_dispdrv.o mxc_lcdif.o mxc_ipuv3_fb.o + obj-$(CONFIG_FB_MXC_EDID) += mxc_dvi.o endif obj-$(CONFIG_FB_MXC_EPSON_PANEL) += mxcfb_epson.o obj-$(CONFIG_FB_MXC_EPSON_QVGA_PANEL) += mxcfb_epson_qvga.o