From: Wolfgang Denk <wd@pollux.(none)>
Date: Sun, 25 Sep 2005 14:31:16 +0000 (+0200)
Subject: Fix VOH405 Support
X-Git-Tag: LABEL_2006_03_12_0025~148
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c177bb5f6c0d496c5e2a429c72f89f325b46198c;p=u-boot

Fix VOH405 Support
Patch by Matthias Fuchs, 25 Sep 2005
---

diff --git a/CHANGELOG b/CHANGELOG
index 97b3efe979..45f759e78f 100644
--- 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 22b49ce256..05c76ff098 100644
--- 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