diff options
| author | Tom Rini <trini@ti.com> | 2014-05-13 07:31:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-13 07:31:00 -0400 |
| commit | e7d4a88e69459547a46906dbe021ccc83c614361 (patch) | |
| tree | 5237f1c81bf8b8d5e93e5f9570f02937ca50d3a4 | |
| parent | 69c0d323e325f48f3124fb0696de3d68fcbcae8e (diff) | |
| parent | 1161f98db687a1cb263cbacdc7eb548a0354218d (diff) | |
| download | u-boot-imx-e7d4a88e69459547a46906dbe021ccc83c614361.zip u-boot-imx-e7d4a88e69459547a46906dbe021ccc83c614361.tar.gz u-boot-imx-e7d4a88e69459547a46906dbe021ccc83c614361.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
| -rw-r--r-- | drivers/video/atmel_hlcdfb.c | 8 | ||||
| -rw-r--r-- | drivers/video/mxc_ipuv3_fb.c | 5 | ||||
| -rw-r--r-- | include/config_fallbacks.h | 4 | ||||
| -rw-r--r-- | tools/logos/syteco.bmp | bin | 11414 -> 11414 bytes |
4 files changed, 13 insertions, 4 deletions
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 853303b..bb4d7d8 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -128,12 +128,12 @@ void lcd_ctrl_init(void *lcdbase) value |= LCDC_LCDCFG1_HSPW(panel_info.vl_hsync_len - 1); lcdc_writel(®s->lcdc_lcdcfg1, value); - value = LCDC_LCDCFG2_VBPW(panel_info.vl_lower_margin); - value |= LCDC_LCDCFG2_VFPW(panel_info.vl_upper_margin - 1); + value = LCDC_LCDCFG2_VBPW(panel_info.vl_upper_margin); + value |= LCDC_LCDCFG2_VFPW(panel_info.vl_lower_margin - 1); lcdc_writel(®s->lcdc_lcdcfg2, value); - value = LCDC_LCDCFG3_HBPW(panel_info.vl_right_margin - 1); - value |= LCDC_LCDCFG3_HFPW(panel_info.vl_left_margin - 1); + value = LCDC_LCDCFG3_HBPW(panel_info.vl_left_margin - 1); + value |= LCDC_LCDCFG3_HFPW(panel_info.vl_right_margin - 1); lcdc_writel(®s->lcdc_lcdcfg3, value); /* Display size */ diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index 3e21fb2..f75d770 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -13,6 +13,7 @@ #include <common.h> #include <asm/errno.h> +#include <asm/global_data.h> #include <linux/string.h> #include <linux/list.h> #include <linux/fb.h> @@ -24,6 +25,8 @@ #include "mxcfb.h" #include "ipu_regs.h" +DECLARE_GLOBAL_DATA_PTR; + static int mxcfb_map_video_memory(struct fb_info *fbi); static int mxcfb_unmap_video_memory(struct fb_info *fbi); @@ -415,6 +418,8 @@ static int mxcfb_map_video_memory(struct fb_info *fbi) fbi->screen_size = fbi->fix.smem_len; + gd->fb_base = fbi->fix.smem_start; + /* Clear the screen */ memset((char *)fbi->screen_base, 0, fbi->fix.smem_len); diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index e6fb47b..b304a41 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -71,6 +71,10 @@ #define CONFIG_LIB_RAND #endif +#if defined(CONFIG_API) && defined(CONFIG_LCD) +#define CONFIG_CMD_BMP +#endif + #ifndef CONFIG_SYS_PROMPT #define CONFIG_SYS_PROMPT "=> " #endif diff --git a/tools/logos/syteco.bmp b/tools/logos/syteco.bmp Binary files differindex 9a994fe..14031f2 100644 --- a/tools/logos/syteco.bmp +++ b/tools/logos/syteco.bmp |
