summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-07-17 20:49:59 +0200
committerWolfgang Denk <wd@denx.de>2010-07-17 20:49:59 +0200
commit1f82ff4777f360e92aa37bbbed647f7b9d9d2044 (patch)
tree2c9e46332357b4b1bbb2c16b397d22958fcacfc3 /drivers
parent0fe247b973d9b8f7e2c04cc159fcdd2e64591e55 (diff)
parent7c050f818b51841de77fbfd077080d94f3c8b3ad (diff)
downloadu-boot-imx-1f82ff4777f360e92aa37bbbed647f7b9d9d2044.zip
u-boot-imx-1f82ff4777f360e92aa37bbbed647f7b9d9d2044.tar.gz
u-boot-imx-1f82ff4777f360e92aa37bbbed647f7b9d9d2044.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/cfb_console.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 96d52fb..fae5417 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -1119,7 +1119,7 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
case 8:
padded_line -= width;
if (VIDEO_DATA_FORMAT == GDF__8BIT_INDEX) {
- /* Copy colormap */
+ /* Copy colormap */
for (xcount = 0; xcount < colors; ++xcount) {
cte = bmp->color_table[xcount];
video_set_lut (xcount, cte.red, cte.green, cte.blue);
@@ -1321,11 +1321,11 @@ void logo_plot (void *screen, int width, int x, int y)
#ifdef CONFIG_VIDEO_BMP_LOGO
source = bmp_logo_bitmap;
- /* Allocate temporary space for computing colormap */
+ /* Allocate temporary space for computing colormap */
logo_red = malloc (BMP_LOGO_COLORS);
logo_green = malloc (BMP_LOGO_COLORS);
logo_blue = malloc (BMP_LOGO_COLORS);
- /* Compute color map */
+ /* Compute color map */
for (i = 0; i < VIDEO_LOGO_COLORS; i++) {
logo_red[i] = (bmp_logo_palette[i] & 0x0f00) >> 4;
logo_green[i] = (bmp_logo_palette[i] & 0x00f0);