Fix VOH405 Support

Patch by Matthias Fuchs, 25 Sep 2005

diff --git a/CHANGELOG b/CHANGELOG
index 97b3efe9790b3ddcc3994f1a591d3525df58a951..45f759e78f1b1cc1f3c5c710e148ee80e726e226 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fix VOH405 Support
+  Patch by Matthias Fuchs, 25 Sep 2005
+
 * Added support for PCI bridge on MPC8272ADS
   Patch by Vitaly Bordug, Feb 09 2005
 

diff --git a/board/esd/common/lcd.c b/board/esd/common/lcd.c
index 22b49ce25684ed7962bcc83c93f3d4ffca477813..05c76ff09880749512a153133501a75787dc680c 100644 (file)
--- a/board/esd/common/lcd.c
+++ b/board/esd/common/lcd.c
@@ -99,7 +99,7 @@ void lcd_bmp(uchar *logo_bmp)
                /*
                 * Decompress bmp image
                 */
-               len = CFG_VIDEO_LOGO_MAX_SIZE;
+               len = CFG_LCD_LOGO_MAX_SIZE;
                dst = malloc(CFG_LCD_LOGO_MAX_SIZE);
                do_free = 1;
                if (gunzip(dst, CFG_LCD_LOGO_MAX_SIZE, (uchar *)logo_bmp, &len) != 0) {
@@ -291,7 +291,7 @@ void lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
        lcd_bmp(logo_bmp);
 }
 
-
+#ifdef CONFIG_VIDEO_SM501
 int do_esdbmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        ulong addr;
@@ -324,3 +324,4 @@ U_BOOT_CMD(
        "esdbmp   - display BMP image\n",
        "<imageAddr> - display image\n"
 );
+#endif