Skip to content
Snippets Groups Projects
Commit 62a22dca authored by Helmut Raiger's avatar Helmut Raiger Committed by Anatolij Gustschin
Browse files

video: Moving mx3fb.c to CONFIG_VIDEO


mx3fb.c was based on CONFIG_LCD and is moved by this patch to
CONFIG_VIDEO, which has greater freedom in selecting videomodes
even at runtime.

This renders the accumulating list of display defines
(CONFIG_DISPLAY_VBEST..., CONFIG_DISPLAY_C057...) obsolete as
these may be setup through env variables:

uboot> setenv mydisplay 'video=ctfb:x:240,y:320,depth:16,mode:0,pclk:185925,
	le:9,ri:17,up:7,lo:10,hs:1,vs:1,sync:100663296,vmode:0'
uboot> setenv videomode ${mydisplay}

This commit also fixes the board config files for qong and
imx31_phycore boards as needed. The videomode settings of
previously supported displays are added to CONFIG_EXTRA_ENV_SETTINGS
now. CONFIG_SYS_MALLOC_LEN for imx31_phycore board is increased
to make the frame buffer allocation working with the changed
driver.

Signed-off-by: default avatarHelmut Raiger <helmut.raiger@hale.at>
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
parent f0029198
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,7 @@ COBJS-$(CONFIG_VIDEO_AMBA) += amba.o ...@@ -35,7 +35,7 @@ COBJS-$(CONFIG_VIDEO_AMBA) += amba.o
COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o
COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o
COBJS-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o COBJS-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o
COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.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_MX5) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o
COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o videomodes.o COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o videomodes.o
COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o
......
...@@ -160,6 +160,13 @@ ...@@ -160,6 +160,13 @@
#endif #endif
#endif #endif
/*
* Defines for the i.MX31 driver (mx3fb.c)
*/
#ifdef CONFIG_VIDEO_MX3
#define VIDEO_FB_16BPP_WORD_SWAP
#endif
/* /*
* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc. * Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc.
*/ */
......
This diff is collapsed.
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
/* /*
* Size of malloc() pool * Size of malloc() pool
*/ */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 512 * 1024)
/* /*
* Hardware drivers * Hardware drivers
...@@ -104,7 +104,8 @@ ...@@ -104,7 +104,8 @@
"mtdparts=" MTDPARTS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \
"prg_uboot=tftpboot 0x80000000 $(uboot); protect off 0xa0000000 +0x20000; erase 0xa0000000 +0x20000; cp.b 0x80000000 0xa0000000 $(filesize)\0" \ "prg_uboot=tftpboot 0x80000000 $(uboot); protect off 0xa0000000 +0x20000; erase 0xa0000000 +0x20000; cp.b 0x80000000 0xa0000000 $(filesize)\0" \
"prg_kernel=tftpboot 0x80000000 $(uimage); erase 0xa0040000 +0x180000; cp.b 0x80000000 0xa0040000 $(filesize)\0" \ "prg_kernel=tftpboot 0x80000000 $(uimage); erase 0xa0040000 +0x180000; cp.b 0x80000000 0xa0040000 $(filesize)\0" \
"prg_jffs2=tftpboot 0x80000000 $(jffs2); erase 0xa01c0000 0xa1ffffff; cp.b 0x80000000 0xa01c0000 $(filesize)\0" "prg_jffs2=tftpboot 0x80000000 $(jffs2); erase 0xa01c0000 0xa1ffffff; cp.b 0x80000000 0xa01c0000 $(filesize)\0" \
"videomode=video=ctfb:x:240,y:320,depth:16,mode:0,pclk:185925,le:9,ri:17,up:7,lo:10,hs:1,vs:1,sync:1241513985,vmode:0\0"
#define CONFIG_SMC911X 1 #define CONFIG_SMC911X 1
...@@ -201,15 +202,16 @@ ...@@ -201,15 +202,16 @@
#define CONFIG_S6E63D6 1 #define CONFIG_S6E63D6 1
#define CONFIG_LCD 1 #define CONFIG_VIDEO
#define CONFIG_VIDEO_MX3 1 #define CONFIG_CFB_CONSOLE
#define CONFIG_SYS_WHITE_ON_BLACK 1 #define CONFIG_VIDEO_MX3
#define LCD_BPP LCD_COLOR8 #define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE 1 #define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 #define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SPLASH_SCREEN 1 #define CONFIG_SPLASH_SCREEN
#define CONFIG_CMD_BMP 1 #define CONFIG_CMD_BMP
#define CONFIG_BMP_16BPP
#endif #endif
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
...@@ -79,15 +79,16 @@ ...@@ -79,15 +79,16 @@
#define CONFIG_DNET_BASE (CS1_BASE + QONG_FPGA_PERIPH_SIZE) #define CONFIG_DNET_BASE (CS1_BASE + QONG_FPGA_PERIPH_SIZE)
/* Framebuffer and LCD */ /* Framebuffer and LCD */
#define CONFIG_LCD #define CONFIG_VIDEO
#define CONFIG_CFB_CONSOLE
#define CONFIG_VIDEO_MX3 #define CONFIG_VIDEO_MX3
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_SW_CURSOR
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define LCD_BPP LCD_COLOR16 #define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN
#define CONFIG_CMD_BMP #define CONFIG_CMD_BMP
#define CONFIG_BMP_16BPP #define CONFIG_BMP_16BPP
#define CONFIG_DISPLAY_COM57H5M10XRC
/* USB */ /* USB */
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
...@@ -177,6 +178,9 @@ ...@@ -177,6 +178,9 @@
" +${filesize};cp.b ${fileaddr} " \ " +${filesize};cp.b ${fileaddr} " \
xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \ xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \
"upd=run load update\0" \ "upd=run load update\0" \
"videomode=video=ctfb:x:640,y:480,depth:16,mode:0,pclk:40000," \
"le:120,ri:40,up:35,lo:10,hs:30,vs:3,sync:100663296," \
"vmode:0\0" \
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment