MCC200: Fix uninitialized variable problem in LCD driver

diff --git a/CHANGELOG b/CHANGELOG
index 51af5e6ab216d037b6caa51fd19cf31316d2e536..7f0b6121aee51e6afb972d37a0dcf4529b96d183 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 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
   Based on idea and implementation from Jeff Mann
   Patch by Stefan Roese, 20 Oct 2006

diff --git a/common/lcd.c b/common/lcd.c
index df31ca9b8c2250c1dc10ad6a8d7c222099950449..eaed2abd80563d6fa6958d25b61dfeccd39dc551 100644 (file)
--- a/common/lcd.c
+++ b/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)
 {
+#if !defined(CONFIG_MCC200)
        ushort *cmap;
+#endif
        ushort i, j;
        uchar *fb;
        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",
                (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 defined(CONFIG_PXA250)
                cmap = (ushort *)fbi->palette;
 #elif defined(CONFIG_MPC823)
                cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]);
-#elif defined(CONFIG_MCC200)
-               /* MCC200 LCD doesn't need CMAP, supports 1bpp b&w only */
 #else
 # error "Don't know location of color map"
 #endif
@@ -654,6 +656,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 #endif
                }
        }
+#endif
 
        /*
         *  BMP format for Monochrome assumes that the state of a