Merge branch 'master' of git://git.denx.de/u-boot-video
This commit is contained in:
commit
3699c28e6d
|
@ -56,6 +56,7 @@ void lcd_panel_disable(void)
|
|||
|
||||
#define msleep(a) udelay(a * 1000)
|
||||
|
||||
#ifndef CONFIG_DISPLAY_VBEST_VGG322403
|
||||
#define XRES 240
|
||||
#define YRES 320
|
||||
#define PANEL_TYPE IPU_PANEL_TFT
|
||||
|
@ -70,6 +71,22 @@ void lcd_panel_disable(void)
|
|||
#define SIG_POL (DI_D3_DRDY_SHARP_POL | DI_D3_CLK_POL)
|
||||
#define IF_CONF 0
|
||||
#define IF_CLK_DIV 0x175
|
||||
#else /* Display Vbest VGG322403 */
|
||||
#define XRES 320
|
||||
#define YRES 240
|
||||
#define PANEL_TYPE IPU_PANEL_TFT
|
||||
#define PIXEL_CLK 156000
|
||||
#define PIXEL_FMT IPU_PIX_FMT_RGB666
|
||||
#define H_START_WIDTH 20 /* left_margin */
|
||||
#define H_SYNC_WIDTH 30 /* hsync_len */
|
||||
#define H_END_WIDTH (38 + 30) /* right_margin + hsync_len */
|
||||
#define V_START_WIDTH 7 /* upper_margin */
|
||||
#define V_SYNC_WIDTH 3 /* vsync_len */
|
||||
#define V_END_WIDTH (26 + 3) /* lower_margin + vsync_len */
|
||||
#define SIG_POL (DI_D3_DRDY_SHARP_POL | DI_D3_CLK_POL)
|
||||
#define IF_CONF 0
|
||||
#define IF_CLK_DIV 0x175
|
||||
#endif
|
||||
|
||||
#define LCD_COLOR_IPU LCD_COLOR16
|
||||
|
||||
|
|
|
@ -62,6 +62,17 @@
|
|||
#define CONFIG_DNET_BASE (CS1_BASE + QONG_FPGA_PERIPH_SIZE)
|
||||
#define CONFIG_NET_MULTI 1
|
||||
|
||||
/* Framebuffer and LCD */
|
||||
#define CONFIG_LCD
|
||||
#define CONFIG_VIDEO_MX3
|
||||
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
|
||||
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
|
||||
#define LCD_BPP LCD_COLOR16
|
||||
#define CONFIG_SPLASH_SCREEN
|
||||
#define CONFIG_CMD_BMP
|
||||
#define CONFIG_BMP_16BPP
|
||||
#define CONFIG_DISPLAY_VBEST_VGG322403
|
||||
|
||||
/*
|
||||
* Reducing the ARP timeout from default 5 seconds to 200ms we speed up the
|
||||
* initial TFTP transfer, should the user wish one, significantly.
|
||||
|
|
Loading…
Reference in New Issue