summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorLiu Ying <b17645@freescale.com>2011-01-10 10:35:25 +0800
committerLiu Ying <b17645@freescale.com>2011-01-10 10:40:43 +0800
commit724822b8c5839202fd8932c56b7319ff40c6cc6b (patch)
treed12b6886f4aba2f97617e2759ad62bef2d64e8d0 /board
parent34b78f4a60195a1c3daf758b31620f25f6981e00 (diff)
downloadu-boot-imx-724822b8c5839202fd8932c56b7319ff40c6cc6b.zip
u-boot-imx-724822b8c5839202fd8932c56b7319ff40c6cc6b.tar.gz
u-boot-imx-724822b8c5839202fd8932c56b7319ff40c6cc6b.tar.bz2
ENGR00137766 BBG splashimage:Allocate cmap for panel_info
This patch allocates cmap for panel_info, otherwise, cmap_base in common/lcd.c will be NULL pointer. Signed-off-by: Liu Ying <b17645@freescale.com>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx51_bbg/mx51_bbg.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/board/freescale/mx51_bbg/mx51_bbg.c b/board/freescale/mx51_bbg/mx51_bbg.c
index d5d565e..5fdeaad 100644
--- a/board/freescale/mx51_bbg/mx51_bbg.c
+++ b/board/freescale/mx51_bbg/mx51_bbg.c
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
*
- * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
+ * (C) Copyright 2009-2011 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -75,6 +75,14 @@ u32 mx51_io_base_addr;
#ifdef CONFIG_VIDEO_MX5
extern unsigned char fsl_bmp_600x400[];
extern int fsl_bmp_600x400_size;
+
+#if defined(CONFIG_BMP_8BPP)
+short colormap[256];
+#elif defined(CONFIG_BMP_16BPP)
+short colormap[65536];
+#else
+short colormap[16777216];
+#endif
#endif
extern int mx51_fb_init(struct fb_videomode *mode, int di,
@@ -916,6 +924,7 @@ static void panel_info_init(void)
panel_info.vl_bpix = LCD_BPP;
panel_info.vl_col = claa_wvga.xres;
panel_info.vl_row = claa_wvga.yres;
+ panel_info.cmap = colormap;
}
#endif