Rename CONFIG_VIDEO_MX5 as this driver can also be used on mx6.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- drivers/video/Makefile | 2 +- drivers/video/cfb_console.c | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/vision2.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 842cbdf..c78f002 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -41,7 +41,7 @@ COBJS-$(CONFIG_VIDEO_DA8XX) += da8xx-fb.o videomodes.o COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o COBJS-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.o videomodes.o -COBJS-$(CONFIG_VIDEO_MX5) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o +COBJS-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o COBJS-$(CONFIG_VIDEO_SM501) += sm501.o diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 904caf7..4cdbbe9 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -164,7 +164,7 @@ /* * Defines for the i.MX31 driver (mx3fb.c) */ -#if defined(CONFIG_VIDEO_MX3) || defined(CONFIG_VIDEO_MX5) +#if defined(CONFIG_VIDEO_MX3) || defined(CONFIG_VIDEO_IPUV3) #define VIDEO_FB_16BPP_WORD_SWAP #endif
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 58b6f1c..8b04dc7 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -126,7 +126,7 @@ /* Framebuffer and LCD */ #define CONFIG_PREBOOT #define CONFIG_VIDEO -#define CONFIG_VIDEO_MX5 +#define CONFIG_VIDEO_IPUV3 #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_BMP_RLE8 diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 99daafb..7a4a9ea 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -223,7 +223,7 @@ /* Framebuffer and LCD */ #define CONFIG_PREBOOT #define CONFIG_VIDEO -#define CONFIG_VIDEO_MX5 +#define CONFIG_VIDEO_IPUV3 #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_BMP_RLE8 diff --git a/include/configs/vision2.h b/include/configs/vision2.h index f6904f3..6eebbb6 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -214,7 +214,7 @@ */ #define CONFIG_PREBOOT #define CONFIG_VIDEO -#define CONFIG_VIDEO_MX5 +#define CONFIG_VIDEO_IPUV3 #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_BMP_RLE8