Browse Source

MCC200: Fix uninitialized variable problem in LCD driver

Wolfgang Denk 18 years ago
parent
commit
f641471498
2 changed files with 7 additions and 2 deletions
  1. 2 0
      CHANGELOG
  2. 5 2
      common/lcd.c

+ 2 - 0
CHANGELOG

@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 Changes since U-Boot 1.1.4:
 ======================================================================
 ======================================================================
 
 
+* MCC200: Fix uninitialized variable problem in LCD driver
+
 * Add board/cpu specific NAND chip select function to 440 NDFC
 * Add board/cpu specific NAND chip select function to 440 NDFC
   Based on idea and implementation from Jeff Mann
   Based on idea and implementation from Jeff Mann
   Patch by Stefan Roese, 20 Oct 2006
   Patch by Stefan Roese, 20 Oct 2006

+ 5 - 2
common/lcd.c

@@ -578,7 +578,9 @@ void bitmap_plot (int x, int y)
  */
  */
 int lcd_display_bitmap(ulong bmp_image, int x, int y)
 int lcd_display_bitmap(ulong bmp_image, int x, int y)
 {
 {
+#if !defined(CONFIG_MCC200)
 	ushort *cmap;
 	ushort *cmap;
+#endif
 	ushort i, j;
 	ushort i, j;
 	uchar *fb;
 	uchar *fb;
 	bmp_image_t *bmp=(bmp_image_t *)bmp_image;
 	bmp_image_t *bmp=(bmp_image_t *)bmp_image;
@@ -624,13 +626,13 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 	debug ("Display-bmp: %d x %d  with %d colors\n",
 	debug ("Display-bmp: %d x %d  with %d colors\n",
 		(int)width, (int)height, (int)colors);
 		(int)width, (int)height, (int)colors);
 
 
+#if !defined(CONFIG_MCC200)
+	/* MCC200 LCD doesn't need CMAP, supports 1bpp b&w only */
 	if (bpix==8) {
 	if (bpix==8) {
 #if defined(CONFIG_PXA250)
 #if defined(CONFIG_PXA250)
 		cmap = (ushort *)fbi->palette;
 		cmap = (ushort *)fbi->palette;
 #elif defined(CONFIG_MPC823)
 #elif defined(CONFIG_MPC823)
 		cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]);
 		cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]);
-#elif defined(CONFIG_MCC200)
-		/* MCC200 LCD doesn't need CMAP, supports 1bpp b&w only */
 #else
 #else
 # error "Don't know location of color map"
 # error "Don't know location of color map"
 #endif
 #endif
@@ -654,6 +656,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 #endif
 #endif
 		}
 		}
 	}
 	}
+#endif
 
 
 	/*
 	/*
 	 *  BMP format for Monochrome assumes that the state of a
 	 *  BMP format for Monochrome assumes that the state of a