Prevent crash if random/invalid ramdisks are passed to bootm

[platform/kernel/u-boot.git] / common / lcd.c

diff --git a/common/lcd.c b/common/lcd.c
index 3bbc7ba..25f8664 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -55,8 +55,6 @@
 #include <nand.h>
 #endif
 
-#ifdef CONFIG_LCD
-
 /************************************************************************/
 /* ** FONT DATA                                                                */
 /************************************************************************/
@@ -678,6 +676,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
                /* Set color map */
                for (i=0; i<colors; ++i) {
                        bmp_color_table_entry_t cte = bmp->color_table[i];
+#if !defined(CONFIG_ATMEL_LCD)
                        ushort colreg =
                                ( ((cte.red)   << 8) & 0xf800) |
                                ( ((cte.green) << 3) & 0x07e0) |
@@ -692,6 +691,9 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 #elif defined(CONFIG_MPC823)
                        cmap--;
 #endif
+#else /* CONFIG_ATMEL_LCD */
+                       lcd_setcolreg(i, cte.red, cte.green, cte.blue);
+#endif
                }
        }
 #endif
@@ -727,7 +729,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
        for (i = 0; i < height; ++i) {
                WATCHDOG_RESET();
                for (j = 0; j < width ; j++)
-#if defined(CONFIG_PXA250)
+#if defined(CONFIG_PXA250) || defined(CONFIG_ATMEL_LCD)
                        *(fb++) = *(bmap++);
 #elif defined(CONFIG_MPC823) || defined(CONFIG_MCC200)
                        *(fb++)=255-*(bmap++);
@@ -789,7 +791,7 @@ static void *lcd_logo (void)
        sprintf (info, "%s (%s - %s) ", U_BOOT_VERSION, __DATE__, __TIME__);
        lcd_drawchars (LCD_INFO_X, LCD_INFO_Y, (uchar *)info, strlen(info));
 
-       sprintf (info, "(C) 2004 DENX Software Engineering");
+       sprintf (info, "(C) 2008 DENX Software Engineering GmbH");
        lcd_drawchars (LCD_INFO_X, LCD_INFO_Y + VIDEO_FONT_HEIGHT,
                                        (uchar *)info, strlen(info));
 
@@ -863,5 +865,3 @@ static void *lcd_logo (void)
 
 /************************************************************************/
 /************************************************************************/
-
-#endif /* CONFIG_LCD */